Imported Upstream version 1.2.14upstream/1.2.14

1 files changed, 35 insertions, 53 deletions

diff --git a/examples/verify1.c b/examples/verify1.c
index 04917e5a..9f2eff5b 100644
--- a/examples/verify1.c
+++ b/examples/verify1.c
@@ -4,11 +4,11 @@
  * Verifies a file using a key from PEM file.
  * 
  * Usage: 
- *      verify1 <signed-file> <pem-key> 
+ *	verify1 <signed-file> <pem-key> 
  *
  * Example:
- *      ./verify1 sign1-res.xml rsapub.pem
- *      ./verify1 sign2-res.xml rsapub.pem
+ *	./verify1 sign1-res.xml rsapub.pem
+ *	./verify1 sign2-res.xml rsapub.pem
  * 
  * This is free software; see Copyright file in the source
  * distribution for preciese wording.
@@ -25,7 +25,6 @@
 
 #ifndef XMLSEC_NO_XSLT
 #include <libxslt/xslt.h>
-#include <libxslt/security.h>
 #endif /* XMLSEC_NO_XSLT */
 
 #include <xmlsec/xmlsec.h>
@@ -37,16 +36,12 @@ int verify_file(const char* xml_file, const char* key_file);
 
 int 
 main(int argc, char **argv) {
-#ifndef XMLSEC_NO_XSLT
-    xsltSecurityPrefsPtr xsltSecPrefs = NULL;
-#endif /* XMLSEC_NO_XSLT */
-
     assert(argv);
 
     if(argc != 3) {
-        fprintf(stderr, "Error: wrong number of arguments.\n");
-        fprintf(stderr, "Usage: %s <xml-file> <key-file>\n", argv[0]);
-        return(1);
+	fprintf(stderr, "Error: wrong number of arguments.\n");
+	fprintf(stderr, "Usage: %s <xml-file> <key-file>\n", argv[0]);
+	return(1);
     }
 
     /* Init libxml and libxslt libraries */
@@ -57,29 +52,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
@@ -89,27 +72,27 @@ 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);
     }
 
     if(verify_file(argv[1], argv[2]) < 0) {
-        return(-1);
+	return(-1);
     }    
     
     /* Shutdown xmlsec-crypto library */
@@ -123,7 +106,6 @@ main(int argc, char **argv) {
 
     /* Shutdown libxslt/libxml */
 #ifndef XMLSEC_NO_XSLT
-    xsltFreeSecurityPrefs(xsltSecPrefs);
     xsltCleanupGlobals();            
 #endif /* XMLSEC_NO_XSLT */
     xmlCleanupParser();
@@ -133,8 +115,8 @@ main(int argc, char **argv) {
 
 /** 
  * verify_file:
- * @xml_file:           the signed XML file name.
- * @key_file:           the PEM public key file name.
+ * @xml_file:		the signed XML file name.
+ * @key_file:		the PEM public key file name.
  *
  * Verifies XML signature in #xml_file using public key from #key_file.
  *
@@ -153,48 +135,48 @@ verify_file(const char* xml_file, const char* key_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, we don't need keys manager in this example */
     dsigCtx = xmlSecDSigCtxCreate(NULL);
     if(dsigCtx == NULL) {
         fprintf(stderr,"Error: failed to create signature context\n");
-        goto done;
+	goto done;
     }
 
     /* load public key */
     dsigCtx->signKey = xmlSecCryptoAppKeyLoad(key_file, xmlSecKeyDataFormatPem, NULL, NULL, NULL);
     if(dsigCtx->signKey == NULL) {
         fprintf(stderr,"Error: failed to load public pem key from \"%s\"\n", key_file);
-        goto done;
+	goto done;
     }
 
     /* set key name to the file name, this is just an example! */
     if(xmlSecKeySetName(dsigCtx->signKey, key_file) < 0) {
-        fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file);
-        goto done;
+    	fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file);
+	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 */
@@ -203,11 +185,11 @@ verify_file(const char* xml_file, const char* key_file) {
 done:    
     /* cleanup */
     if(dsigCtx != NULL) {
-        xmlSecDSigCtxDestroy(dsigCtx);
+	xmlSecDSigCtxDestroy(dsigCtx);
     }
     
     if(doc != NULL) {
-        xmlFreeDoc(doc); 
+	xmlFreeDoc(doc); 
     }
     return(res);
 }