summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/decrypt1.c2
-rw-r--r--examples/decrypt2.c4
-rw-r--r--examples/decrypt3.c2
-rw-r--r--examples/encrypt1.c2
-rw-r--r--examples/encrypt2.c2
-rw-r--r--examples/encrypt3.c4
-rw-r--r--examples/sign1.c2
-rw-r--r--examples/sign2.c2
-rw-r--r--examples/sign3.c16
-rw-r--r--examples/verify1.c2
-rw-r--r--examples/verify2.c4
-rw-r--r--examples/verify3.c6
-rw-r--r--examples/verify4.c10
-rw-r--r--examples/xmldsigverify.c4
14 files changed, 37 insertions, 25 deletions
diff --git a/examples/decrypt1.c b/examples/decrypt1.c
index 881eb947..7819dfbe 100644
--- a/examples/decrypt1.c
+++ b/examples/decrypt1.c
@@ -92,7 +92,7 @@ main(int argc, char **argv) {
if(xmlSecCryptoDLLoadLibrary(NULL) < 0) {
fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n"
"that you have it installed and check shared libraries path\n"
- "(LD_LIBRARY_PATH) envornment variable.\n");
+ "(LD_LIBRARY_PATH and/or LTDL_LIBRARY_PATH) environment variables.\n");
return(-1);
}
#endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
diff --git a/examples/decrypt2.c b/examples/decrypt2.c
index c07e988b..5ac11cef 100644
--- a/examples/decrypt2.c
+++ b/examples/decrypt2.c
@@ -95,7 +95,7 @@ main(int argc, char **argv) {
if(xmlSecCryptoDLLoadLibrary(NULL) < 0) {
fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n"
"that you have it installed and check shared libraries path\n"
- "(LD_LIBRARY_PATH) envornment variable.\n");
+ "(LD_LIBRARY_PATH and/or LTDL_LIBRARY_PATH) environment variables.\n");
return(-1);
}
#endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
@@ -151,7 +151,7 @@ main(int argc, char **argv) {
* @files_size: the number of filenames in #files.
*
* Creates simple keys manager and load DES keys from #files in it.
- * The caller is responsible for destroing returned keys manager using
+ * The caller is responsible for destroying returned keys manager using
* @xmlSecKeysMngrDestroy.
*
* Returns the pointer to newly created keys manager or NULL if an error
diff --git a/examples/decrypt3.c b/examples/decrypt3.c
index a1371332..113271c4 100644
--- a/examples/decrypt3.c
+++ b/examples/decrypt3.c
@@ -97,7 +97,7 @@ main(int argc, char **argv) {
if(xmlSecCryptoDLLoadLibrary(NULL) < 0) {
fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n"
"that you have it installed and check shared libraries path\n"
- "(LD_LIBRARY_PATH) envornment variable.\n");
+ "(LD_LIBRARY_PATH and/or LTDL_LIBRARY_PATH) environment variables.\n");
return(-1);
}
#endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
diff --git a/examples/encrypt1.c b/examples/encrypt1.c
index ef132482..956dfacf 100644
--- a/examples/encrypt1.c
+++ b/examples/encrypt1.c
@@ -94,7 +94,7 @@ main(int argc, char **argv) {
if(xmlSecCryptoDLLoadLibrary(NULL) < 0) {
fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n"
"that you have it installed and check shared libraries path\n"
- "(LD_LIBRARY_PATH) envornment variable.\n");
+ "(LD_LIBRARY_PATH and/or LTDL_LIBRARY_PATH) environment variables.\n");
return(-1);
}
#endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
diff --git a/examples/encrypt2.c b/examples/encrypt2.c
index cda3447c..c9ea6263 100644
--- a/examples/encrypt2.c
+++ b/examples/encrypt2.c
@@ -95,7 +95,7 @@ main(int argc, char **argv) {
if(xmlSecCryptoDLLoadLibrary(NULL) < 0) {
fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n"
"that you have it installed and check shared libraries path\n"
- "(LD_LIBRARY_PATH) envornment variable.\n");
+ "(LD_LIBRARY_PATH and/or LTDL_LIBRARY_PATH) environment variables.\n");
return(-1);
}
#endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
diff --git a/examples/encrypt3.c b/examples/encrypt3.c
index cf2882da..176d7a54 100644
--- a/examples/encrypt3.c
+++ b/examples/encrypt3.c
@@ -97,7 +97,7 @@ main(int argc, char **argv) {
if(xmlSecCryptoDLLoadLibrary(NULL) < 0) {
fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n"
"that you have it installed and check shared libraries path\n"
- "(LD_LIBRARY_PATH) envornment variable.\n");
+ "(LD_LIBRARY_PATH and/or LTDL_LIBRARY_PATH) environment variables.\n");
return(-1);
}
#endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
@@ -153,7 +153,7 @@ main(int argc, char **argv) {
* @key_file: the key filename.
*
* Creates simple keys manager and load RSA key from #key_file in it.
- * The caller is responsible for destroing returned keys manager using
+ * The caller is responsible for destroying returned keys manager using
* @xmlSecKeysMngrDestroy.
*
* Returns the pointer to newly created keys manager or NULL if an error
diff --git a/examples/sign1.c b/examples/sign1.c
index 050211cc..cc6b7a48 100644
--- a/examples/sign1.c
+++ b/examples/sign1.c
@@ -93,7 +93,7 @@ main(int argc, char **argv) {
if(xmlSecCryptoDLLoadLibrary(NULL) < 0) {
fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n"
"that you have it installed and check shared libraries path\n"
- "(LD_LIBRARY_PATH) envornment variable.\n");
+ "(LD_LIBRARY_PATH and/or LTDL_LIBRARY_PATH) environment variables.\n");
return(-1);
}
#endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
diff --git a/examples/sign2.c b/examples/sign2.c
index 2e05dfae..1802b397 100644
--- a/examples/sign2.c
+++ b/examples/sign2.c
@@ -96,7 +96,7 @@ main(int argc, char **argv) {
if(xmlSecCryptoDLLoadLibrary(NULL) < 0) {
fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n"
"that you have it installed and check shared libraries path\n"
- "(LD_LIBRARY_PATH) envornment variable.\n");
+ "(LD_LIBRARY_PATH and/or LTDL_LIBRARY_PATH) environment variables.\n");
return(-1);
}
#endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
diff --git a/examples/sign3.c b/examples/sign3.c
index 847daa09..adadac1f 100644
--- a/examples/sign3.c
+++ b/examples/sign3.c
@@ -100,7 +100,7 @@ main(int argc, char **argv) {
if(xmlSecCryptoDLLoadLibrary(NULL) < 0) {
fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n"
"that you have it installed and check shared libraries path\n"
- "(LD_LIBRARY_PATH) envornment variable.\n");
+ "(LD_LIBRARY_PATH and/or LTDL_LIBRARY_PATH) environment variables.\n");
return(-1);
}
#endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
@@ -158,6 +158,7 @@ sign_file(const char* xml_file, const char* key_file, const char* cert_file) {
xmlNodePtr signNode = NULL;
xmlNodePtr refNode = NULL;
xmlNodePtr keyInfoNode = NULL;
+ xmlNodePtr x509DataNode = NULL;
xmlSecDSigCtxPtr dsigCtx = NULL;
int res = -1;
@@ -204,11 +205,22 @@ sign_file(const char* xml_file, const char* key_file, const char* cert_file) {
goto done;
}
- if(xmlSecTmplKeyInfoAddX509Data(keyInfoNode) == NULL) {
+ x509DataNode = xmlSecTmplKeyInfoAddX509Data(keyInfoNode);
+ if(x509DataNode == NULL) {
fprintf(stderr, "Error: failed to add X509Data node\n");
goto done;
}
+ if(xmlSecTmplX509DataAddSubjectName(x509DataNode) == NULL) {
+ fprintf(stderr, "Error: failed to add X509SubjectName node\n");
+ goto done;
+ }
+
+ if(xmlSecTmplX509DataAddCertificate(x509DataNode) == NULL) {
+ fprintf(stderr, "Error: failed to add X509Certificate node\n");
+ goto done;
+ }
+
/* create signature context, we don't need keys manager in this example */
dsigCtx = xmlSecDSigCtxCreate(NULL);
if(dsigCtx == NULL) {
diff --git a/examples/verify1.c b/examples/verify1.c
index 182da2d0..2e69df8b 100644
--- a/examples/verify1.c
+++ b/examples/verify1.c
@@ -91,7 +91,7 @@ main(int argc, char **argv) {
if(xmlSecCryptoDLLoadLibrary(NULL) < 0) {
fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n"
"that you have it installed and check shared libraries path\n"
- "(LD_LIBRARY_PATH) envornment variable.\n");
+ "(LD_LIBRARY_PATH and/or LTDL_LIBRARY_PATH) environment variables.\n");
return(-1);
}
#endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
diff --git a/examples/verify2.c b/examples/verify2.c
index f7a84768..0d2b7c69 100644
--- a/examples/verify2.c
+++ b/examples/verify2.c
@@ -94,7 +94,7 @@ main(int argc, char **argv) {
if(xmlSecCryptoDLLoadLibrary(NULL) < 0) {
fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n"
"that you have it installed and check shared libraries path\n"
- "(LD_LIBRARY_PATH) envornment variable.\n");
+ "(LD_LIBRARY_PATH and/or LTDL_LIBRARY_PATH) environment variables.\n");
return(-1);
}
#endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
@@ -151,7 +151,7 @@ main(int argc, char **argv) {
* @files_size: the number of filenames in #files.
*
* Creates simple keys manager and load PEM keys from #files in it.
- * The caller is responsible for destroing returned keys manager using
+ * The caller is responsible for destroying returned keys manager using
* @xmlSecKeysMngrDestroy.
*
* Returns the pointer to newly created keys manager or NULL if an error
diff --git a/examples/verify3.c b/examples/verify3.c
index 7f80bb56..af8cb9c9 100644
--- a/examples/verify3.c
+++ b/examples/verify3.c
@@ -1,4 +1,4 @@
-/**
+/**
* XML Security Library example: Verifying a file signed with X509 certificate
*
* Verifies a file signed with X509 certificate.
@@ -95,7 +95,7 @@ main(int argc, char **argv) {
if(xmlSecCryptoDLLoadLibrary(NULL) < 0) {
fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n"
"that you have it installed and check shared libraries path\n"
- "(LD_LIBRARY_PATH) envornment variable.\n");
+ "(LD_LIBRARY_PATH and/or LTDL_LIBRARY_PATH) environment variables.\n");
return(-1);
}
#endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
@@ -152,7 +152,7 @@ main(int argc, char **argv) {
* @files_size: the number of filenames in #files.
*
* Creates simple keys manager and load trusted certificates from PEM #files.
- * The caller is responsible for destroing returned keys manager using
+ * The caller is responsible for destroying returned keys manager using
* @xmlSecKeysMngrDestroy.
*
* Returns the pointer to newly created keys manager or NULL if an error
diff --git a/examples/verify4.c b/examples/verify4.c
index e438d748..7e8c47fd 100644
--- a/examples/verify4.c
+++ b/examples/verify4.c
@@ -1,7 +1,7 @@
/**
* XML Security Library example: Verifying a simple SAML response with X509 certificate
*
- * Verifies a simple SAML response. In addition to refular verification
+ * Verifies a simple SAML response. In addition to regular verification
* we ensure that the signature has only one <dsig:Reference/> element
* with an empty or NULL URI attribute and one enveloped signature transform
* as it is required by SAML specification.
@@ -12,12 +12,12 @@
* Usage:
* verify4 <signed-file> <trusted-cert-pem-file1> [<trusted-cert-pem-file2> [...]]
*
- * Example (sucecess):
+ * Example (success):
* ./verify4 verify4-res.xml ca2cert.pem cacert.pem
*
* Example (failure):
* ./verify4 verify4-bad-res.xml ca2cert.pem cacert.pem
- * In the same time, verify3 example successfuly verifies this signature:
+ * In the same time, verify3 example successfully verifies this signature:
* ./verify3 verify4-bad-res.xml ca2cert.pem cacert.pem
*
* This is free software; see Copyright file in the source
@@ -103,7 +103,7 @@ main(int argc, char **argv) {
if(xmlSecCryptoDLLoadLibrary(NULL) < 0) {
fprintf(stderr, "Error: unable to load default xmlsec-crypto library. Make sure\n"
"that you have it installed and check shared libraries path\n"
- "(LD_LIBRARY_PATH) envornment variable.\n");
+ "(LD_LIBRARY_PATH and/or LTDL_LIBRARY_PATH) environment variables.\n");
return(-1);
}
#endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
@@ -160,7 +160,7 @@ main(int argc, char **argv) {
* @files_size: the number of filenames in #files.
*
* Creates simple keys manager and load trusted certificates from PEM #files.
- * The caller is responsible for destroing returned keys manager using
+ * The caller is responsible for destroying returned keys manager using
* @xmlSecKeysMngrDestroy.
*
* Returns the pointer to newly created keys manager or NULL if an error
diff --git a/examples/xmldsigverify.c b/examples/xmldsigverify.c
index f6a9c847..01d666d5 100644
--- a/examples/xmldsigverify.c
+++ b/examples/xmldsigverify.c
@@ -91,7 +91,7 @@ main(int argc, char **argv) {
if(xmlSecCryptoDLLoadLibrary(NULL) < 0) {
fprintf(stdout, "Error: unable to load default xmlsec-crypto library. Make sure\n"
"that you have it installed and check shared libraries path\n"
- "(LD_LIBRARY_PATH) envornment variable.\n");
+ "(LD_LIBRARY_PATH and/or LTDL_LIBRARY_PATH) environment variables.\n");
return(-1);
}
#endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
@@ -263,7 +263,7 @@ verify_request(xmlSecKeysMngrPtr mngr) {
xmlBufferAdd(buffer, buf, ret);
}
- /* is the document subbmitted from the form? */
+ /* is the document submitted from the form? */
if(strncmp((char*)xmlBufferContent(buffer), "_xmldoc=", 8) == 0) {
xmlBufferShrink(buffer, 8);
buffer->use = url_decode((char*)xmlBufferContent(buffer), xmlBufferLength(buffer));
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 05:14:47 +0000