Imported Upstream version 1.2.14upstream/1.2.14

1 files changed, 47 insertions, 64 deletions

diff --git a/docs/api/xmlsec-verify-with-x509.html b/docs/api/xmlsec-verify-with-x509.html
index 8ee5478e..5dbd2e04 100644
--- a/docs/api/xmlsec-verify-with-x509.html
+++ b/docs/api/xmlsec-verify-with-x509.html
@@ -100,10 +100,10 @@
  * certificates management policies for another crypto library may break it.
  *
  * Usage: 
- *      verify3 <signed-file> <trusted-cert-pem-file1> [<trusted-cert-pem-file2> [...]]
+ *	verify3 <signed-file> <trusted-cert-pem-file1> [<trusted-cert-pem-file2> [...]]
  *
  * Example:
- *      ./verify3 sign3-res.xml rootcert.pem
+ *	./verify3 sign3-res.xml rootcert.pem
  * 
  * This is free software; see Copyright file in the source
  * distribution for preciese wording.
@@ -120,7 +120,6 @@
 
 #ifndef XMLSEC_NO_XSLT
 #include <libxslt/xslt.h>
-#include <libxslt/security.h>
 #endif /* XMLSEC_NO_XSLT */
 
 #include <xmlsec/xmlsec.h>
@@ -133,17 +132,14 @@ int verify_file(xmlSecKeysMngrPtr mngr, const char* xml_file);
 
 int 
 main(int argc, char **argv) {
-#ifndef XMLSEC_NO_XSLT
-    xsltSecurityPrefsPtr xsltSecPrefs = NULL;
-#endif /* XMLSEC_NO_XSLT */
     xmlSecKeysMngrPtr mngr;
     
     assert(argv);
 
     if(argc < 3) {
-        fprintf(stderr, "Error: wrong number of arguments.\n");
-        fprintf(stderr, "Usage: %s <xml-file> <cert-file1> [<cert-file2> [...]]\n", argv[0]);
-        return(1);
+	fprintf(stderr, "Error: wrong number of arguments.\n");
+	fprintf(stderr, "Usage: %s <xml-file> <cert-file1> [<cert-file2> [...]]\n", argv[0]);
+	return(1);
     }
 
     /* Init libxml and libxslt libraries */
@@ -154,29 +150,17 @@ main(int argc, char **argv) {
 #ifndef XMLSEC_NO_XSLT
     xmlIndentTreeOutput = 1; 
 #endif /* XMLSEC_NO_XSLT */
-
-    /* Init libxslt */
-#ifndef XMLSEC_NO_XSLT
-    /* disable everything */
-    xsltSecPrefs = xsltNewSecurityPrefs(); 
-    xsltSetSecurityPrefs(xsltSecPrefs,  XSLT_SECPREF_READ_FILE,        xsltSecurityForbid);
-    xsltSetSecurityPrefs(xsltSecPrefs,  XSLT_SECPREF_WRITE_FILE,       xsltSecurityForbid);
-    xsltSetSecurityPrefs(xsltSecPrefs,  XSLT_SECPREF_CREATE_DIRECTORY, xsltSecurityForbid);
-    xsltSetSecurityPrefs(xsltSecPrefs,  XSLT_SECPREF_READ_NETWORK,     xsltSecurityForbid);
-    xsltSetSecurityPrefs(xsltSecPrefs,  XSLT_SECPREF_WRITE_NETWORK,    xsltSecurityForbid);
-    xsltSetDefaultSecurityPrefs(xsltSecPrefs); 
-#endif /* XMLSEC_NO_XSLT */
-                
+        	
     /* Init xmlsec library */
     if(xmlSecInit() < 0) {
-        fprintf(stderr, "Error: xmlsec initialization failed.\n");
-        return(-1);
+	fprintf(stderr, "Error: xmlsec initialization failed.\n");
+	return(-1);
     }
 
     /* Check loaded library version */
     if(xmlSecCheckVersion() != 1) {
-        fprintf(stderr, "Error: loaded xmlsec library version is not compatible.\n");
-        return(-1);
+	fprintf(stderr, "Error: loaded xmlsec library version is not compatible.\n");
+	return(-1);
     }
 
     /* Load default crypto engine if we are supporting dynamic
@@ -186,35 +170,35 @@ main(int argc, char **argv) {
      */
 #ifdef XMLSEC_CRYPTO_DYNAMIC_LOADING
     if(xmlSecCryptoDLLoadLibrary(BAD_CAST XMLSEC_CRYPTO) < 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");
-        return(-1);     
+	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");
+	return(-1);	
     }
 #endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */
 
     /* Init crypto library */
     if(xmlSecCryptoAppInit(NULL) < 0) {
-        fprintf(stderr, "Error: crypto initialization failed.\n");
-        return(-1);
+	fprintf(stderr, "Error: crypto initialization failed.\n");
+	return(-1);
     }
 
     /* Init xmlsec-crypto library */
     if(xmlSecCryptoInit() < 0) {
-        fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n");
-        return(-1);
+	fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n");
+	return(-1);
     }
 
     /* create keys manager and load trusted certificates */
     mngr = load_trusted_certs(&(argv[2]), argc - 2);
     if(mngr == NULL) {
-        return(-1);
+	return(-1);
     }
     
     /* verify file */
     if(verify_file(mngr, argv[1]) < 0) {
-        xmlSecKeysMngrDestroy(mngr);    
-        return(-1);
+	xmlSecKeysMngrDestroy(mngr);	
+	return(-1);
     }    
     
     /* destroy keys manager */
@@ -231,7 +215,6 @@ main(int argc, char **argv) {
 
     /* Shutdown libxslt/libxml */
 #ifndef XMLSEC_NO_XSLT
-    xsltFreeSecurityPrefs(xsltSecPrefs);
     xsltCleanupGlobals();            
 #endif /* XMLSEC_NO_XSLT */
     xmlCleanupParser();
@@ -241,8 +224,8 @@ main(int argc, char **argv) {
 
 /**
  * load_trusted_certs:
- * @files:              the list of filenames.
- * @files_size:         the number of filenames in #files.
+ * @files:		the list of filenames.
+ * @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
@@ -265,24 +248,24 @@ load_trusted_certs(char** files, int files_size) {
      */
     mngr = xmlSecKeysMngrCreate();
     if(mngr == NULL) {
-        fprintf(stderr, "Error: failed to create keys manager.\n");
-        return(NULL);
+	fprintf(stderr, "Error: failed to create keys manager.\n");
+	return(NULL);
     }
     if(xmlSecCryptoAppDefaultKeysMngrInit(mngr) < 0) {
-        fprintf(stderr, "Error: failed to initialize keys manager.\n");
-        xmlSecKeysMngrDestroy(mngr);
-        return(NULL);
+	fprintf(stderr, "Error: failed to initialize keys manager.\n");
+	xmlSecKeysMngrDestroy(mngr);
+	return(NULL);
     }    
     
     for(i = 0; i < files_size; ++i) {
-        assert(files[i]);
+	assert(files[i]);
 
-        /* load trusted cert */
-        if(xmlSecCryptoAppKeysMngrCertLoad(mngr, files[i], xmlSecKeyDataFormatPem, xmlSecKeyDataTypeTrusted) < 0) {
-            fprintf(stderr,"Error: failed to load pem certificate from \"%s\"\n", files[i]);
-            xmlSecKeysMngrDestroy(mngr);
-            return(NULL);
-        }
+	/* load trusted cert */
+	if(xmlSecCryptoAppKeysMngrCertLoad(mngr, files[i], xmlSecKeyDataFormatPem, xmlSecKeyDataTypeTrusted) < 0) {
+    	    fprintf(stderr,"Error: failed to load pem certificate from \"%s\"\n", files[i]);
+	    xmlSecKeysMngrDestroy(mngr);
+	    return(NULL);
+	}
     }
 
     return(mngr);
@@ -290,8 +273,8 @@ load_trusted_certs(char** files, int files_size) {
 
 /** 
  * verify_file:
- * @mngr:               the pointer to keys manager.
- * @xml_file:           the signed XML file name.
+ * @mngr:		the pointer to keys manager.
+ * @xml_file:		the signed XML file name.
  *
  * Verifies XML signature in #xml_file.
  *
@@ -310,35 +293,35 @@ verify_file(xmlSecKeysMngrPtr mngr, const char* xml_file) {
     /* load file */
     doc = xmlParseFile(xml_file);
     if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){
-        fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file);
-        goto done;      
+	fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file);
+	goto done;	
     }
     
     /* find start node */
     node = xmlSecFindNode(xmlDocGetRootElement(doc), xmlSecNodeSignature, xmlSecDSigNs);
     if(node == NULL) {
-        fprintf(stderr, "Error: start node not found in \"%s\"\n", xml_file);
-        goto done;      
+	fprintf(stderr, "Error: start node not found in \"%s\"\n", xml_file);
+	goto done;	
     }
 
     /* create signature context */
     dsigCtx = xmlSecDSigCtxCreate(mngr);
     if(dsigCtx == NULL) {
         fprintf(stderr,"Error: failed to create signature context\n");
-        goto done;
+	goto done;
     }
 
     /* Verify signature */
     if(xmlSecDSigCtxVerify(dsigCtx, node) < 0) {
         fprintf(stderr,"Error: signature verify\n");
-        goto done;
+	goto done;
     }
         
     /* print verification result to stdout */
     if(dsigCtx->status == xmlSecDSigStatusSucceeded) {
-        fprintf(stdout, "Signature is OK\n");
+	fprintf(stdout, "Signature is OK\n");
     } else {
-        fprintf(stdout, "Signature is INVALID\n");
+	fprintf(stdout, "Signature is INVALID\n");
     }    
 
     /* success */
@@ -347,11 +330,11 @@ verify_file(xmlSecKeysMngrPtr mngr, const char* xml_file) {
 done:    
     /* cleanup */
     if(dsigCtx != NULL) {
-        xmlSecDSigCtxDestroy(dsigCtx);
+	xmlSecDSigCtxDestroy(dsigCtx);
     }
     
     if(doc != NULL) {
-        xmlFreeDoc(doc); 
+	xmlFreeDoc(doc); 
     }
     return(res);
 }