diff options
| author | Aleksey Sanin <aleksey@src.gnome.org> | 2003-08-21 04:30:13 +0000 |
|---|---|---|
| committer | Aleksey Sanin <aleksey@src.gnome.org> | 2003-08-21 04:30:13 +0000 |
| commit | 8daa23058714dc78f24a2eb37a5cb4d2d228a6ca (patch) | |
| tree | 13f02f6b21a9bc0cbcf1b9802fdc11f78dc34af3 | |
| parent | 4a664cafd85129eafc1c210c04fc44f804486d21 (diff) | |
| download | xmlsec1-8daa23058714dc78f24a2eb37a5cb4d2d228a6ca.tar.gz xmlsec1-8daa23058714dc78f24a2eb37a5cb4d2d228a6ca.tar.bz2 xmlsec1-8daa23058714dc78f24a2eb37a5cb4d2d228a6ca.zip | |
1.1.1 release preparation
77 files changed, 943 insertions, 879 deletions
@@ -1,3 +1,11 @@ +Wed Aug 20 21:26:00 2003 Aleksey Sanin <aleksey@aleksey.com> + + * configure.in docs/api/sgml/version.sgml docs/api/xmlsec-version.html + docs/index.html docs/news.html docs/xmlsec-man.html + include/xmlsec/version.h man/xmlsec1-config.1 man/xmlsec1.1: new 1.1.1 + release preparation + * docs/*: re-run docs generation/formatting + Fri Aug 8 22:18:45 2003 Aleksey Sanin <aleksey@aleksey.com> * src/xpath.c: register namespaces before processing XPointer diff --git a/configure.in b/configure.in index 5db55201..5f9816ab 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_CANONICAL_HOST XMLSEC_PACKAGE=xmlsec1 XMLSEC_VERSION_MAJOR=1 XMLSEC_VERSION_MINOR=1 -XMLSEC_VERSION_SUBMINOR=0 +XMLSEC_VERSION_SUBMINOR=1 XMLSEC_VERSION="$XMLSEC_VERSION_MAJOR.$XMLSEC_VERSION_MINOR.$XMLSEC_VERSION_SUBMINOR" XMLSEC_VERSION_INFO=`echo $XMLSEC_VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'` XMLSEC_VERSION_SAFE=`echo $XMLSEC_VERSION | sed 's/\./_/g'` diff --git a/docs/api-0.0.x/examples/example-dsig1.html b/docs/api-0.0.x/examples/example-dsig1.html index e8611325..2648e554 100644 --- a/docs/api-0.0.x/examples/example-dsig1.html +++ b/docs/api-0.0.x/examples/example-dsig1.html @@ -98,21 +98,21 @@ per application<br><br><code> keysMngr = xmlSecSimpleKeysMngrCreate(); <br> if(keysMngr == NULL) {<br> - fprintf(stderr, "Error: failed to create keys manager\n");<br> + fprintf(stderr, "Error: failed to create keys manager\n");<br> goto done; <br> }<br><br> /** <br> * load key<br> */<br> if(xmlSecSimpleKeysMngrLoadPemKey(keysMngr, argv[1], NULL, NULL, 1) == NULL) {<br> - fprintf(stderr, "Error: failed to load key from -\"%s\"\n", argv[1]);<br> + fprintf(stderr, "Error: failed to load key from +\"%s\"\n", argv[1]);<br> goto done;<br> }<br> <br> dsigCtx = xmlSecDSigCtxCreate(keysMngr);<br> if(dsigCtx == NULL) {<br> - fprintf(stderr,"Error: failed to create dsig context\n");<br> + fprintf(stderr,"Error: failed to create dsig context\n");<br> goto done; <br> }</code><br> </p> @@ -138,8 +138,8 @@ need to add default<br> */<br> doc = xmlParseFile(argv[2]);<br> if (doc == NULL) {<br> - fprintf(stderr, "Error - : unable to parse file \"%s\"\n", argv[2]);<br> + fprintf(stderr, "Error + : unable to parse file \"%s\"\n", argv[2]);<br> goto done;<br> }<br> <br> @@ -147,13 +147,13 @@ need to add default<br> * Check the document is of the right kind<br> */ <br> if(xmlDocGetRootElement(doc) == NULL) {<br> - fprintf(stderr,"Error: -empty document for file \"%s\"\n", argv[2]);<br> + fprintf(stderr,"Error: +empty document for file \"%s\"\n", argv[2]);<br> goto done;<br> }</code><br><br> In this example we set global flags to control how the document is loaded. In the real life you would probably want to control the loading - on "per-document" basis. Check the libxml/c14n.h header file from LibXML + on "per-document" basis. Check the libxml/c14n.h header file from LibXML distribution for details.<br> </p> <h4>Step 3. Adding or changing data in the template.</h4> @@ -164,11 +164,11 @@ add one more node with some text:<br><br> * Add Data to the document<br> */<br> if(xmlNewChild(xmlDocGetRootElement(doc), NULL, - "Something", <br> + "Something", <br> - "Some important data") == NULL) {<br> - fprintf(stderr,"Error: -failed to add data\n");<br> + "Some important data") == NULL) {<br> + fprintf(stderr,"Error: +failed to add data\n");<br> goto done;<br> }</code><br> </p> @@ -181,7 +181,7 @@ failed to add data\n");<br> */ <br> ret = xmlSecDSigGenerate(dsigCtx, NULL, NULL, xmlDocGetRootElement(doc), &result);<br> if(ret < 0) {<br> - fprintf(stderr,"Error: signature failed\n");<br> + fprintf(stderr,"Error: signature failed\n");<br> goto done; <br> } <br> </code> <br> @@ -196,8 +196,8 @@ Print the document to stdout:<br><br><code> xmlDocDumpMemoryEnc(doc, &string, &len, NULL);<br> if(string == NULL) {<br> - fprintf(stderr,"Error: failed to dump document - to memory\n");<br> + fprintf(stderr,"Error: failed to dump document + to memory\n");<br> goto done;<br> }<br> fwrite(string, len, 1, stdout);<br> @@ -242,23 +242,23 @@ Print the document to stdout:<br><br><code> </p> <h4>Appendix A. The template document.</h4> <blockquote> -<code><?xml version="1.0" encoding="UTF-8"?><br> -<Envelope xmlns="urn:envelope"><br> +<code><?xml version="1.0" encoding="UTF-8"?><br> +<Envelope xmlns="urn:envelope"><br> <Data><br> Hello, World!<br> </Data><br> - <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><br> + <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><br> <SignedInfo><br> - <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><br> - <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1" + <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1" /><br> - <Reference URI=""><br> + <Reference URI=""><br> <Transforms><br> - <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" + <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><br> </Transforms><br> - <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" + <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><br> <DigestValue></DigestValue><br> </Reference><br> @@ -272,20 +272,20 @@ Print the document to stdout:<br><br><code> </blockquote> <h4>Appendix B. The signed document.</h4> <blockquote> -<code><?xml version="1.0" encoding="UTF-8"?><br> -<Envelope xmlns="urn:envelope"><br> +<code><?xml version="1.0" encoding="UTF-8"?><br> +<Envelope xmlns="urn:envelope"><br> <Data><br> Hello, World!<br> </Data><br> - <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><br> + <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><br> <SignedInfo><br> - <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><br> - <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/><br> - <Reference URI=""><br> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><br> + <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/><br> + <Reference URI=""><br> <Transforms><br> - <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><br> + <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><br> </Transforms><br> - <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><br> + <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><br> <DigestValue>lUsn3fJYExos8S49s/cc6e1TMrM=</DigestValue><br> </Reference><br> </SignedInfo><br> diff --git a/docs/api-0.0.x/examples/example-dsig2.html b/docs/api-0.0.x/examples/example-dsig2.html index 2ae4680c..123b1e49 100644 --- a/docs/api-0.0.x/examples/example-dsig2.html +++ b/docs/api-0.0.x/examples/example-dsig2.html @@ -101,16 +101,16 @@ context object per application<br><br><code> keysMngr = xmlSecSimpleKeysMngrCreate(); <br> if(keysMngr == NULL) {<br> - fprintf(stderr, "Error: failed to create - keys manager\n");<br> + fprintf(stderr, "Error: failed to create + keys manager\n");<br> goto done; <br> }<br><br> /** <br> * load key<br> */<br> if(xmlSecSimpleKeysMngrLoadPemKey(keysMngr, argv[1], NULL, NULL, 1) == NULL) {<br> - fprintf(stderr, "Error: failed to load -key from \"%s\"\n", argv[1]);<br> + fprintf(stderr, "Error: failed to load +key from \"%s\"\n", argv[1]);<br> goto done;<br> }<br> <br> @@ -120,8 +120,8 @@ key from \"%s\"\n", argv[1]);<br> */<br> dsigCtx = xmlSecDSigCtxCreate(keysMngr);<br> if(dsigCtx == NULL) {<br> - fprintf(stderr,"Error: failed to create -dsig context\n");<br> + fprintf(stderr,"Error: failed to create +dsig context\n");<br> goto done; <br> }</code><br> </p> @@ -145,8 +145,8 @@ dsig context\n");<br> */<br> doc = xmlParseFile(argv[2]);<br> if (doc == NULL) {<br> - fprintf(stderr, "Error - : unable to parse file \"%s\"\n", argv[2]);<br> + fprintf(stderr, "Error + : unable to parse file \"%s\"\n", argv[2]);<br> goto done;<br> }<br> <br> @@ -155,8 +155,8 @@ dsig context\n");<br> kind<br> */ <br> if(xmlDocGetRootElement(doc) == NULL) {<br> - fprintf(stderr,"Error: - empty document for file \"%s\"\n", argv[2]);<br> + fprintf(stderr,"Error: + empty document for file \"%s\"\n", argv[2]);<br> goto done;<br> } </code><code></code> </p> @@ -179,10 +179,10 @@ to use XML Security Library for this and can create the template yourself! /**<br> * Create Signature node <br> */<br> - signatureNode = xmlSecSignatureCreate("NULL");<br> + signatureNode = xmlSecSignatureCreate("NULL");<br> if(signatureNode == NULL) {<br> - fprintf(stderr,"Error: failed -to create signature\n");<br> + fprintf(stderr,"Error: failed +to create signature\n");<br> return(NULL);<br> } <br><br> /**<br> @@ -192,24 +192,24 @@ methods<br> signedInfoNode = xmlSecSignatureAddSignedInfo(signatureNode, NULL);<br> if(signedInfoNode == NULL) {<br> - fprintf(stderr,"Error: failed -to add SignedInfo\n");<br> + fprintf(stderr,"Error: failed +to add SignedInfo\n");<br> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }<br><br> cur = xmlSecSignedInfoAddC14NMethod(signedInfoNode, xmlSecC14NInclusive);<br> if(cur == NULL) {<br> - fprintf(stderr,"Error: failed -to add C14N method\n");<br> + fprintf(stderr,"Error: failed +to add C14N method\n");<br> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }<br><br> cur = xmlSecSignedInfoAddSignMethod(signedInfoNode, xmlSecSignDsaSha1);<br> if(cur == NULL) {<br> - fprintf(stderr,"Error: failed -to add sign method\n");<br> + fprintf(stderr,"Error: failed +to add sign method\n");<br> </code><code></code><code> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }<br><br> @@ -226,16 +226,16 @@ method and<br> NULL);<br> if(referenceNode == NULL) {<br> - fprintf(stderr,"Error: failed -to add Reference\n");<br> + fprintf(stderr,"Error: failed +to add Reference\n");<br> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }<br><br> cur = xmlSecReferenceAddDigestMethod(referenceNode, xmlSecDigestSha1);<br> if(cur == NULL) {<br> - fprintf(stderr,"Error: failed -to add digest method\n");<br> + fprintf(stderr,"Error: failed +to add digest method\n");<br> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }<br> @@ -245,8 +245,8 @@ to add digest method\n");<br> xmlSecTransformEnveloped);<br> if(cur == NULL) {<br> - fprintf(stderr,"Error: failed -to add enveloped transform\n");<br> + fprintf(stderr,"Error: failed +to add enveloped transform\n");<br> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }<br><br> @@ -258,16 +258,16 @@ to add enveloped transform\n");<br> keyInfoNode = xmlSecSignatureAddKeyInfo(signatureNode, NULL); <br> if(keyInfoNode == NULL) {<br> - fprintf(stderr,"Error: failed -to add KeyInfo\n");<br> + fprintf(stderr,"Error: failed +to add KeyInfo\n");<br> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }<br> <br> cur = xmlSecKeyInfoAddKeyValue(keyInfoNode);<br> if(cur == NULL) { <br> - fprintf(stderr,"Error: failed -to add KeyValue node\n");<br> + fprintf(stderr,"Error: failed +to add KeyValue node\n");<br> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }<br><br></code><code> /**<br> @@ -275,8 +275,8 @@ to add KeyValue node\n");<br> */ <br> if(xmlAddChild(xmlDocGetRootElement(doc), signatureNode) == NULL) {<br> - fprintf(stderr,"Error: failed -to add Signature\n");<br> + fprintf(stderr,"Error: failed +to add Signature\n");<br> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }</code><br><code> <br> @@ -294,8 +294,8 @@ to add Signature\n");<br> */ <br> signatureNode = addSignature(doc);<br> if(signatureNode == NULL) {<br> - fprintf(stderr,"Error: failed - to add signature\n");<br> + fprintf(stderr,"Error: failed + to add signature\n");<br> goto done;<br> }</code><code><br><br> /**<br> @@ -303,8 +303,8 @@ to add Signature\n");<br> */ <br> ret = xmlSecDSigGenerate(dsigCtx, NULL, NULL, signatureNode, &result);<br> if(ret < 0) {<br> - fprintf(stderr,"Error: signature - failed\n");<br> + fprintf(stderr,"Error: signature + failed\n");<br> goto done; <br> } </code> </p> @@ -318,8 +318,8 @@ to add Signature\n");<br> xmlDocDumpMemoryEnc(doc, &string, &len, NULL);<br> if(result == NULL) {<br> - fprintf(stderr,"Error: failed -to dump document to memory\n");<br> + fprintf(stderr,"Error: failed +to dump document to memory\n");<br> goto done;<br> }<br> fwrite(string, len, 1, stdout);<br> @@ -364,10 +364,10 @@ KeysManager; shutdown XML Security Library, LIBXml and OpenSSL<br> </p> <h4>Appendix A. The template document.</h4> <blockquote> -<code><?xml version="1.0" encoding="UTF-8"?><br> +<code><?xml version="1.0" encoding="UTF-8"?><br> <Letter><br> Hello, World! <br> - <Info Id="SomeData"><br> + <Info Id="SomeData"><br> <!-- Commentary --><br> <Data1> Some data </Data1><br> <Data2> More data </Data2><br> @@ -375,28 +375,28 @@ KeysManager; shutdown XML Security Library, LIBXml and OpenSSL<br> </Letter></code><br> </blockquote> <h4>Appendix B. The signed document.</h4> -<blockquote><code><?xml version="1.0" encoding="UTF-8"?><br> +<blockquote><code><?xml version="1.0" encoding="UTF-8"?><br> <Letter><br> Hello, World! <br> - <Info Id="SomeData"><br> + <Info Id="SomeData"><br> <!-- Commentary --><br> <Data1> Some data </Data1><br> <Data2> More data </Data2><br> </Info><br> - <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><br> + <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><br> <SignedInfo><br> - <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><br> - <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/><br> - <Reference Id="reference-1" URI="#xpointer(id('SomeData'))"><br> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><br> + <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/><br> + <Reference Id="reference-1" URI="#xpointer(id('SomeData'))"><br> <Transforms><br> - <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/><br> + <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/><br> </Transforms><br> - <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><br> + <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><br> <DigestValue>x/tL8hKZQyExW6ba0pi5h8eWRCc=</DigestValue><br> </Reference><br> </SignedInfo><br> <SignatureValue>sSXCVpcCRydyUIebOFA1xw2Yfgy+YP0Dd41jIz/57iGbowwqyODPfA==</SignatureValue><br> - <KeyInfo Id=""><br> + <KeyInfo Id=""><br> <KeyValue><br> <DSAKeyValue><br> <P><br> diff --git a/docs/api-0.0.x/examples/example-dsig3.html b/docs/api-0.0.x/examples/example-dsig3.html index 03cd7a59..c993ca55 100644 --- a/docs/api-0.0.x/examples/example-dsig3.html +++ b/docs/api-0.0.x/examples/example-dsig3.html @@ -94,16 +94,16 @@ context object per application<br><br><code> keysMngr = xmlSecSimpleKeysMngrCreate(); <br> if(keysMngr == NULL) {<br> - fprintf(stderr, "Error: failed to create - keys manager\n");<br> + fprintf(stderr, "Error: failed to create + keys manager\n");<br> goto done; <br> }<br><br> /** <br> * load key<br> */<br> if(xmlSecSimpleKeysMngrLoadPemKey(keysMngr, argv[1], NULL, NULL, 1) == NULL) {<br> - fprintf(stderr, "Error: failed to load -key from \"%s\"\n", argv[1]);<br> + fprintf(stderr, "Error: failed to load +key from \"%s\"\n", argv[1]);<br> goto done;<br> }<br> <br> @@ -113,8 +113,8 @@ key from \"%s\"\n", argv[1]);<br> */<br> dsigCtx = xmlSecDSigCtxCreate(keysMngr);<br> if(dsigCtx == NULL) {<br> - fprintf(stderr,"Error: failed to create -dsig context\n");<br> + fprintf(stderr,"Error: failed to create +dsig context\n");<br> goto done; <br> }</code><br> </p> @@ -138,8 +138,8 @@ dsig context\n");<br> */<br> doc = xmlParseFile(argv[2]);<br> if (doc == NULL) {<br> - fprintf(stderr, "Error - : unable to parse file \"%s\"\n", argv[2]);<br> + fprintf(stderr, "Error + : unable to parse file \"%s\"\n", argv[2]);<br> goto done;<br> }<br> <br> @@ -148,8 +148,8 @@ dsig context\n");<br> kind<br> */ <br> if(xmlDocGetRootElement(doc) == NULL) {<br> - fprintf(stderr,"Error: - empty document for file \"%s\"\n", argv[2]);<br> + fprintf(stderr,"Error: + empty document for file \"%s\"\n", argv[2]);<br> goto done;<br> } </code><code></code> </p> @@ -172,10 +172,10 @@ to use XML Security Library for this and can create the template yourself! /**<br> * Create Signature node <br> */<br> - signatureNode = xmlSecSignatureCreate("my-signature");<br> + signatureNode = xmlSecSignatureCreate("my-signature");<br> if(signatureNode == NULL) {<br> - fprintf(stderr,"Error: failed -to create signature\n");<br> + fprintf(stderr,"Error: failed +to create signature\n");<br> return(NULL);<br> } <br><br> /**<br> @@ -185,24 +185,24 @@ methods<br> signedInfoNode = xmlSecSignatureAddSignedInfo(signatureNode, NULL);<br> if(signedInfoNode == NULL) {<br> - fprintf(stderr,"Error: failed -to add SignedInfo\n");<br> + fprintf(stderr,"Error: failed +to add SignedInfo\n");<br> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }<br><br> cur = xmlSecSignedInfoAddC14NMethod(signedInfoNode, xmlSecC14NInclusive);<br> if(cur == NULL) {<br> - fprintf(stderr,"Error: failed -to add C14N method\n");<br> + fprintf(stderr,"Error: failed +to add C14N method\n");<br> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }<br><br> cur = xmlSecSignedInfoAddSignMethod(signedInfoNode, xmlSecSignDsaSha1);<br> if(cur == NULL) {<br> - fprintf(stderr,"Error: failed -to add sign method\n");<br> + fprintf(stderr,"Error: failed +to add sign method\n");<br> </code><code></code><code> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }<br><br> @@ -214,22 +214,22 @@ digest<br> */<br> referenceNode = xmlSecSignedInfoAddReference(signedInfoNode,<br> - "my-reference",<br> + "my-reference",<br> - "#xpointer(id('SomeData'))",<br> + "#xpointer(id('SomeData'))",<br> NULL);<br> if(referenceNode == NULL) {<br> - fprintf(stderr,"Error: failed -to add Reference\n");<br> + fprintf(stderr,"Error: failed +to add Reference\n");<br> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }<br><br> cur = xmlSecReferenceAddDigestMethod(referenceNode, xmlSecDigestSha1);<br> if(cur == NULL) {<br> - fprintf(stderr,"Error: failed -to add digest method\n");<br> + fprintf(stderr,"Error: failed +to add digest method\n");<br> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }<br> @@ -239,8 +239,8 @@ to add digest method\n");<br> xmlSecC14NExclusiveWithComments);<br> if(cur == NULL) {<br> - fprintf(stderr,"Error: failed -to add c14n transform\n");<br> + fprintf(stderr,"Error: failed +to add c14n transform\n");<br> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }<br><br> @@ -252,16 +252,16 @@ to add c14n transform\n");<br> keyInfoNode = xmlSecSignatureAddKeyInfo(signatureNode, NULL); <br> if(keyInfoNode == NULL) {<br> - fprintf(stderr,"Error: failed -to add KeyInfo\n");<br> + fprintf(stderr,"Error: failed +to add KeyInfo\n");<br> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }<br> <br> cur = xmlSecKeyInfoAddKeyValue(keyInfoNode);<br> if(cur == NULL) { <br> - fprintf(stderr,"Error: failed -to add KeyValue node\n");<br> + fprintf(stderr,"Error: failed +to add KeyValue node\n");<br> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }<br><br></code><code> /**<br> @@ -269,8 +269,8 @@ to add KeyValue node\n");<br> */ <br> if(xmlAddChild(xmlDocGetRootElement(doc), signatureNode) == NULL) {<br> - fprintf(stderr,"Error: failed -to add Signature\n");<br> + fprintf(stderr,"Error: failed +to add Signature\n");<br> xmlSecSignatureDestroy(signatureNode);<br> return(NULL);<br> }</code><br><code> <br> @@ -288,8 +288,8 @@ to add Signature\n");<br> */ <br> signatureNode = addSignature(doc);<br> if(signatureNode == NULL) {<br> - fprintf(stderr,"Error: failed - to add signature\n");<br> + fprintf(stderr,"Error: failed + to add signature\n");<br> goto done;<br> }</code><code><br><br> /**<br> @@ -297,8 +297,8 @@ to add Signature\n");<br> */ <br> ret = xmlSecDSigGenerate(dsigCtx, NULL, NULL, signatureNode, &result);<br> if(ret < 0) {<br> - fprintf(stderr,"Error: signature - failed\n");<br> + fprintf(stderr,"Error: signature + failed\n");<br> goto done; <br> } </code> </p> @@ -312,8 +312,8 @@ to add Signature\n");<br> xmlDocDumpMemoryEnc(doc, &string, &len, NULL);<br> if(result == NULL) {<br> - fprintf(stderr,"Error: failed -to dump document to memory\n");<br> + fprintf(stderr,"Error: failed +to dump document to memory\n");<br> goto done;<br> }<br> fwrite(string, len, 1, stdout);<br> @@ -358,10 +358,10 @@ KeysManager; shutdown XML Security Library, LIBXml and OpenSSL<br> </p> <h4>Appendix A. The template document.</h4> <blockquote> -<code><?xml version="1.0" encoding="UTF-8"?><br> +<code><?xml version="1.0" encoding="UTF-8"?><br> <Letter><br> Hello, World! <br> - <Info Id="SomeData"><br> + <Info Id="SomeData"><br> <!-- Commentary --><br> <Data1> Some data </Data1><br> <Data2> More data </Data2><br> @@ -369,28 +369,28 @@ KeysManager; shutdown XML Security Library, LIBXml and OpenSSL<br> </Letter></code><br> </blockquote> <h4>Appendix B. The signed document.</h4> -<blockquote><code><?xml version="1.0" encoding="UTF-8"?><br> +<blockquote><code><?xml version="1.0" encoding="UTF-8"?><br> <Letter><br> Hello, World! <br> - <Info Id="SomeData"><br> + <Info Id="SomeData"><br> <!-- Commentary --><br> <Data1> Some data </Data1><br> <Data2> More data </Data2><br> </Info><br> - <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><br> + <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><br> <SignedInfo><br> - <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><br> - <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/><br> - <Reference Id="reference-1" URI="#xpointer(id('SomeData'))"><br> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><br> + <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/><br> + <Reference Id="reference-1" URI="#xpointer(id('SomeData'))"><br> <Transforms><br> - <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/><br> + <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/><br> </Transforms><br> - <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><br> + <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><br> <DigestValue>x/tL8hKZQyExW6ba0pi5h8eWRCc=</DigestValue><br> </Reference><br> </SignedInfo><br> <SignatureValue>sSXCVpcCRydyUIebOFA1xw2Yfgy+YP0Dd41jIz/57iGbowwqyODPfA==</SignatureValue><br> - <KeyInfo Id=""><br> + <KeyInfo Id=""><br> <KeyValue><br> <DSAKeyValue><br> <P><br> diff --git a/docs/api-0.0.x/examples/example-dsig4.html b/docs/api-0.0.x/examples/example-dsig4.html index a8805e2b..23c66d80 100644 --- a/docs/api-0.0.x/examples/example-dsig4.html +++ b/docs/api-0.0.x/examples/example-dsig4.html @@ -84,14 +84,14 @@ should be done once in the beginning of your program.<br><code> keysMngr = xmlSecSimpleKeysMngrCreate(); <br> if(keysMngr == NULL) {<br> - fprintf(stderr, "Error: failed to create -keys manager\n");<br> + fprintf(stderr, "Error: failed to create +keys manager\n");<br> goto done; <br> }<br><br> dsigCtx = xmlSecDSigCtxCreate(keysMngr);<br> if(dsigCtx == NULL) {<br> - fprintf(stderr,"Error: failed to create -dsig context\n");<br> + fprintf(stderr,"Error: failed to create +dsig context\n");<br> goto done; <br> }<br> </code><br> @@ -120,8 +120,8 @@ dsig context\n");<br> */<br> doc = xmlParseFile(argv[2]);<br> if (doc == NULL) {<br> - fprintf(stderr, "Error - : unable to parse file \"%s\"\n", argv[1]);<br> + fprintf(stderr, "Error + : unable to parse file \"%s\"\n", argv[1]);<br> goto done;<br> }<br> <br> @@ -130,14 +130,14 @@ dsig context\n");<br> kind<br> */ <br> if(xmlDocGetRootElement(doc) == NULL) {<br> - fprintf(stderr,"Error: - empty document for file \"%s\"\n", argv[1]);<br> + fprintf(stderr,"Error: + empty document for file \"%s\"\n", argv[1]);<br> goto done;<br> }<br> </code><br> In this example we set global flags to control how the document is loaded. In the real life you would probably want to control the -loading on "per-document" basis. Check the libxml/c14n.h header file +loading on "per-document" basis. Check the libxml/c14n.h header file from LibXML distribution for details.<br> </p> <h4>Step 2. Verify It!</h4> @@ -146,10 +146,10 @@ from LibXML distribution for details.<br> <Signature> node:<br><code><br> xmlNodePtr signNode;<br> xmlSecDSigResultPtr result = NULL;</code><br><br><code> signNode = xmlSecFindNode(xmlDocGetRootElement(doc), -BAD_CAST "Signature", xmlSecDSigNs);<br> +BAD_CAST "Signature", xmlSecDSigNs);<br> if(signNode == NULL) {<br> - fprintf(stderr,"Error: failed -to find Signature node\n");<br> + fprintf(stderr,"Error: failed +to find Signature node\n");<br> goto done;<br> } </code><br> <code> <br> @@ -158,8 +158,8 @@ to find Signature node\n");<br> */ <br> ret = xmlSecDSigValidate(dsigCtx, NULL, NULL, signNode, &result);<br> if(ret < 0) {<br> - fprintf(stderr,"Error: verification -failed\n");<br> + fprintf(stderr,"Error: verification +failed\n");<br> goto done; <br> } </code> <code></code> @@ -213,31 +213,31 @@ verification results. Real application should process signature objects list </p> <h4>Appendix A. The verification output.</h4> <blockquote> -<code>= SIGNATURE (validate)</code><br><code>== result: OK</code><br><code>== sign method: http://www.w3.org/2000/09/xmldsig#dsa-sha1</code><br><code>== key name: (null)</code><br><code>== key origin: 0</code><br><code>== start buffer:</code><br><code><SignedInfo xmlns="http://www.w3.org/2000/09/xmldsig#"></code><br><code><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"></CanonicalizationMethod></code><br><code><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"></SignatureMethod></code><br><code><Reference Id="reference-1" URI="#xpointer(id('SomeData'))"></code><br><code><Transforms></code><br><code><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"></Transform></code><br><code></Transforms></code><br><code><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></DigestMethod><DigestValue>x/tL8hKZQyExW6ba0pi5h8eWRCc=</DigestValue></code><br><code></Reference></code><br><code></SignedInfo></code><br><code>== end buffer</code><br><code>== SIGNED INFO REFERENCES</code><br><code>==== REFERENCE </code><br><code>===== ref type: SignedInfo Reference</code><br><code>===== result: OK</code><br><code>===== digest method: http://www.w3.org/2000/09/xmldsig#sha1</code><br><code>===== uri: #xpointer(id('SomeData'))</code><br><code>===== type: NULL</code><br><code>===== id: reference-1</code><br><code>===== start buffer:</code><br><code><Info Id="SomeData"></code><br><code> <!-- Commentary --></code><br><code> <Data1> Some data </Data1></code><br><code> <Data2> More data </Data2></code><br><code> </Info></code><br><code>===== end buffer</code><br> +<code>= SIGNATURE (validate)</code><br><code>== result: OK</code><br><code>== sign method: http://www.w3.org/2000/09/xmldsig#dsa-sha1</code><br><code>== key name: (null)</code><br><code>== key origin: 0</code><br><code>== start buffer:</code><br><code><SignedInfo xmlns="http://www.w3.org/2000/09/xmldsig#"></code><br><code><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"></CanonicalizationMethod></code><br><code><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"></SignatureMethod></code><br><code><Reference Id="reference-1" URI="#xpointer(id('SomeData'))"></code><br><code><Transforms></code><br><code><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"></Transform></code><br><code></Transforms></code><br><code><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></DigestMethod><DigestValue>x/tL8hKZQyExW6ba0pi5h8eWRCc=</DigestValue></code><br><code></Reference></code><br><code></SignedInfo></code><br><code>== end buffer</code><br><code>== SIGNED INFO REFERENCES</code><br><code>==== REFERENCE </code><br><code>===== ref type: SignedInfo Reference</code><br><code>===== result: OK</code><br><code>===== digest method: http://www.w3.org/2000/09/xmldsig#sha1</code><br><code>===== uri: #xpointer(id('SomeData'))</code><br><code>===== type: NULL</code><br><code>===== id: reference-1</code><br><code>===== start buffer:</code><br><code><Info Id="SomeData"></code><br><code> <!-- Commentary --></code><br><code> <Data1> Some data </Data1></code><br><code> <Data2> More data </Data2></code><br><code> </Info></code><br><code>===== end buffer</code><br> </blockquote> <h4>Appendix B. The signed document.</h4> -<blockquote><code><?xml version="1.0" encoding="UTF-8"?><br> +<blockquote><code><?xml version="1.0" encoding="UTF-8"?><br> <Letter><br> Hello, World! <br> - <Info Id="SomeData"><br> + <Info Id="SomeData"><br> <!-- Commentary --><br> <Data1> Some data </Data1><br> <Data2> More data </Data2><br> </Info><br> - <Something>Some important data</Something><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><br> + <Something>Some important data</Something><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><br> <SignedInfo><br> - <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><br> - <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/><br> - <Reference Id="reference-1" URI="#xpointer(id('SomeData'))"><br> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><br> + <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/><br> + <Reference Id="reference-1" URI="#xpointer(id('SomeData'))"><br> <Transforms><br> - <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/><br> + <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/><br> </Transforms><br> - <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><br> + <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><br> <DigestValue>x/tL8hKZQyExW6ba0pi5h8eWRCc=</DigestValue><br> </Reference><br> </SignedInfo><br> <SignatureValue>uwYbk29Juoe8B0eCW6aAjw4t+QBT7oQsjAmQnu8fFQPNy0RwP6pWNA==</SignatureValue><br> - <KeyInfo Id=""><br> + <KeyInfo Id=""><br> <KeyValue><br> <DSAKeyValue><br> <P><br> diff --git a/docs/api-0.0.x/examples/example-enc1.html b/docs/api-0.0.x/examples/example-enc1.html index d65eb814..63535f11 100644 --- a/docs/api-0.0.x/examples/example-enc1.html +++ b/docs/api-0.0.x/examples/example-enc1.html @@ -114,8 +114,8 @@ sizeof(rnd_seed));<br> keysMngr = xmlSecSimpleKeysMngrCreate(); <br> if(keysMngr == NULL) {<br> - fprintf(stderr, "Error: failed to create keys - manager\n");<br> + fprintf(stderr, "Error: failed to create keys + manager\n");<br> return(-1); <br> }<br><br> <br> @@ -124,14 +124,14 @@ sizeof(rnd_seed));<br> */<br> ctx = xmlSecEncCtxCreate(keysMngr);<br> if(ctx == NULL) {<br> - fprintf(stderr, "Error: template failed to create context\n");<br> + fprintf(stderr, "Error: template failed to create context\n");<br> return(-1)<br> }<br> /** <br> * load key public rsa key<br> */<br> if(xmlSecSimpleKeysMngrLoadPemKey(keysMngr, argv[1], NULL, NULL, 0) == NULL) {<br> - fprintf(stderr, "Error: failed to load key from \"%s\"\n", argv[1]);<br> + fprintf(stderr, "Error: failed to load key from \"%s\"\n", argv[1]);<br> return(-1);<br> }<br> <br></code> @@ -151,8 +151,8 @@ sizeof(rnd_seed));<br> */<br> encData = xmlSecEncDataCreate(NULL, NULL, NULL, NULL);<br> if(encData == NULL) {<br> - </code><code>fprintf(stderr, "Error: template - creation failed\n");<br></code><code> </code><code> goto done; + </code><code>fprintf(stderr, "Error: template + creation failed\n");<br></code><code> </code><code> goto done; <br> }<br><br> /**<br> @@ -160,20 +160,20 @@ sizeof(rnd_seed));<br> */<br> cur = xmlSecEncDataAddEncMethod(encData, xmlSecEncDes3Cbc);<br> if(cur == NULL) {<br> - fprintf(stderr, "Error: failed to add Enc Method\n");<br> + fprintf(stderr, "Error: failed to add Enc Method\n");<br> goto done; <br> }<br><br> /**<br> * Add EncryptionProperties node just for fun<br> */<br> - cur = xmlSecEncDataAddEncProperty(encData, BAD_CAST "Classified", + cur = xmlSecEncDataAddEncProperty(encData, BAD_CAST "Classified", NULL);<br> if(cur == NULL) {<br> - fprintf(stderr, "Error: failed to add KeyInfo\n");<br> + fprintf(stderr, "Error: failed to add KeyInfo\n");<br> goto done; <br> }<br> - xmlSetProp(cur, BAD_CAST "Level", BAD_CAST "Top secret: - destroy before reading");<br><br> + xmlSetProp(cur, BAD_CAST "Level", BAD_CAST "Top secret: + destroy before reading");<br><br> /** <br> * The encrypted data should be saved in CipherValue node <br> @@ -181,7 +181,7 @@ sizeof(rnd_seed));<br> cur = xmlSecEncDataAddCipherValue(encData); <br> if(cur == NULL) {<br> - fprintf(stderr, "Error: failed to add CipherValue\n");<br> + fprintf(stderr, "Error: failed to add CipherValue\n");<br> goto done; <br> }<br><br> /**<br> @@ -189,7 +189,7 @@ sizeof(rnd_seed));<br> */<br> cur = xmlSecEncDataAddKeyInfo(encData);<br> if(cur == NULL) {<br> - fprintf(stderr, "Error: failed to add KeyInfo\n");<br> + fprintf(stderr, "Error: failed to add KeyInfo\n");<br> goto done; <br> }<br><br> /**<br> @@ -200,7 +200,7 @@ sizeof(rnd_seed));<br> encKey = xmlSecKeyInfoAddEncryptedKey(cur, NULL, NULL, NULL);<br> if(encKey == NULL) {<br> - fprintf(stderr, "Error: failed to add EncryptedKey\n");<br> + fprintf(stderr, "Error: failed to add EncryptedKey\n");<br> goto done; <br> }<br> <br> @@ -210,8 +210,8 @@ sizeof(rnd_seed));<br> */<br> cur = xmlSecEncDataAddEncMethod(encKey, xmlSecEncRsaOaep);<br> if(cur == NULL) {<br> - fprintf(stderr, "Error: failed to add EncryptedKey - Enc Method\n");<br> + fprintf(stderr, "Error: failed to add EncryptedKey + Enc Method\n");<br> goto done; <br> }<br> <br> @@ -221,8 +221,8 @@ sizeof(rnd_seed));<br> cur = xmlSecEncDataAddCipherValue(encKey); <br> if(cur == NULL) {<br> - fprintf(stderr, "Error: failed to add EncryptedKey - CipherValue\n");<br> + fprintf(stderr, "Error: failed to add EncryptedKey + CipherValue\n");<br> goto done; <br> }<br><br> /**<br> @@ -231,14 +231,14 @@ key<br> */<br> cur = xmlSecEncDataAddKeyInfo(encKey);<br> if(cur == NULL) {<br> - fprintf(stderr, "Error: failed to add EncryptedKey - KeyInfo\n");<br> + fprintf(stderr, "Error: failed to add EncryptedKey + KeyInfo\n");<br> goto done; <br> }<br><br> cur = xmlSecKeyInfoAddKeyName(cur);<br> if(cur == NULL) {<br> - fprintf(stderr, "Error: failed to add EncryptedKey - KeyName\n");<br> + fprintf(stderr, "Error: failed to add EncryptedKey + KeyName\n");<br> goto done; <br> } <br></code><br> </p> @@ -246,7 +246,7 @@ key<br> <p> We are ready to encrypt the document!<br> <code> <br> - static const char buf[] = "big secret";<br></code><code> <br> + static const char buf[] = "big secret";<br></code><code> <br> /**<br> * Finally encrypt everything<br> */<br> @@ -255,8 +255,8 @@ key<br> strlen(buf), &result);<br> if(ret < 0) {<br> - fprintf(stderr, "Error: memory encryption - failed\n");<br> + fprintf(stderr, "Error: memory encryption + failed\n");<br> goto done; <br> }<br> <br> @@ -301,13 +301,13 @@ and KeysManager; shutdown XML Security Library, libxml and OpenSSL:<br><br> </p> <h4>Appendix A. The encrypted document.</h4> <blockquote> -<code><?xml version="1.0"?><br> - <EncryptedData xmlns="http://www.w3.org/2001/04/xmlenc#"><br> - <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/><br> - <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><br> - <EncryptedKey xmlns="http://www.w3.org/2001/04/xmlenc#"><br> - <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/><br> - <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><br> +<code><?xml version="1.0"?><br> + <EncryptedData xmlns="http://www.w3.org/2001/04/xmlenc#"><br> + <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/><br> + <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><br> + <EncryptedKey xmlns="http://www.w3.org/2001/04/xmlenc#"><br> + <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/><br> + <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><br> <KeyName>test-rsa-key</KeyName><br> </KeyInfo><br> <CipherData><br> @@ -328,7 +328,7 @@ and KeysManager; shutdown XML Security Library, libxml and OpenSSL:<br><br> </CipherValue><br> </CipherData><br> <EncryptionProperties><br> - <EncryptionProperty Id="Classified" Level="Top secret"/><br> + <EncryptionProperty Id="Classified" Level="Top secret"/><br> </EncryptionProperties><br> </EncryptedData></code><br> </blockquote> diff --git a/docs/api-0.0.x/examples/example-enc2.html b/docs/api-0.0.x/examples/example-enc2.html index f98e27da..b315cef0 100644 --- a/docs/api-0.0.x/examples/example-enc2.html +++ b/docs/api-0.0.x/examples/example-enc2.html @@ -107,8 +107,8 @@ only one context object per application<br><br><code> keysMngr = xmlSecSimpleKeysMngrCreate(); <br> if(keysMngr == NULL) {<br> - fprintf(stderr, "Error: failed to create keys - manager\n");<br> + fprintf(stderr, "Error: failed to create keys + manager\n");<br> return(-1); <br> }<br><br> <br><br> @@ -117,14 +117,14 @@ only one context object per application<br><br><code> */<br> ctx = xmlSecEncCtxCreate(keysMngr);<br> if(ctx == NULL) {<br> - fprintf(stderr, "Error: template failed to create context\n");<br> + fprintf(stderr, "Error: template failed to create context\n");<br> return(-1)<br> }<br><br> /** <br> * load key private rsa key<br> */<br> if(xmlSecSimpleKeysMngrLoadPem(keysMgr, argv[1], NULL, NULL, 1) == NULL) {<br> - fprintf(stderr, "Error: failed to load key from \"%s\"\n", argv[1]);<br> + fprintf(stderr, "Error: failed to load key from \"%s\"\n", argv[1]);<br> return(-1);<br> }<br><br></code> </p> @@ -146,7 +146,7 @@ references<br> xmlSubstituteEntitiesDefault(1);<br><br> doc = xmlParseFile(filename);<br> if (doc == NULL) {<br> - fprintf(stderr, "Error: unable to parse file \"%s\"\n", + fprintf(stderr, "Error: unable to parse file \"%s\"\n", filename);<br> goto done; <br> }<br> @@ -155,8 +155,8 @@ filename);<br> * Check the document is of the right kind<br> */ <br> if(xmlDocGetRootElement(doc) == NULL) {<br> - fprintf(stderr,"Error: empty document for file -\"%s\"\n", filename);<br> + fprintf(stderr,"Error: empty document for file +\"%s\"\n", filename);<br> goto done; <br> }<br> <br> @@ -165,7 +165,7 @@ filename);<br> */<br> ret = xmlSecDecrypt(ctx, NULL, NULL, xmlDocGetRootElement(doc), &result);<br> if(ret < 0) {<br> - fprintf(stderr, "Error: decryption failed\n");<br> + fprintf(stderr, "Error: decryption failed\n");<br> goto done; <br> }<br> <br> @@ -211,13 +211,13 @@ filename);<br> ERR_clear_error();</code><code></code><code></code> </p> <h4>Appendix A. The encrypted document.</h4> -<blockquote><code><?xml version="1.0"?><br> - <EncryptedData xmlns="http://www.w3.org/2001/04/xmlenc#"><br> - <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/><br> - <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><br> - <EncryptedKey xmlns="http://www.w3.org/2001/04/xmlenc#"><br> - <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/><br> - <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><br> +<blockquote><code><?xml version="1.0"?><br> + <EncryptedData xmlns="http://www.w3.org/2001/04/xmlenc#"><br> + <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/><br> + <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><br> + <EncryptedKey xmlns="http://www.w3.org/2001/04/xmlenc#"><br> + <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/><br> + <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><br> <KeyName>test-rsa-key</KeyName><br> </KeyInfo><br> <CipherData><br> @@ -238,7 +238,7 @@ filename);<br> </CipherValue><br> </CipherData><br> <EncryptionProperties><br> - <EncryptionProperty Id="Classified" Level="Top secret"/><br> + <EncryptionProperty Id="Classified" Level="Top secret"/><br> </EncryptionProperties><br> </EncryptedData> </code></blockquote> diff --git a/docs/api-0.0.x/faq.html b/docs/api-0.0.x/faq.html index 8b76de33..acf8ac2a 100644 --- a/docs/api-0.0.x/faq.html +++ b/docs/api-0.0.x/faq.html @@ -94,7 +94,7 @@ </p> <h4>2.2. How to compile xmlsec?</h4> <p> - On Unix just follow the "standard": + On Unix just follow the "standard": </p> <blockquote> <code>gunzip -c xmlsec-xxx.tar.gz | tar xvf -</code><br><code>cd xmlsec-xxxx</code><br><code>./configure --help</code><br><code>./configure [possible options] </code><br><code>make</code><br><code>make install</code><br><code>make check</code> @@ -232,7 +232,7 @@ to <code>xmlSecTransformStatusOk</code>. </p> <h4>3.2. I am trying to sign an XML document and I have a warning - about "empty nodes set". Should I worry about this?</h4> + about "empty nodes set". Should I worry about this?</h4> <p> Most likely <b>yes</b>. When it's not an error from specification point of view, I can hardly imagine a real world case that @@ -242,14 +242,14 @@ For example, the following Reference element: </p> <blockquote><code> - <?xml version="1.0" encoding="UTF-8"><br> + <?xml version="1.0" encoding="UTF-8"><br> <Root><br> - <Data Id="1234"><br> + <Data Id="1234"><br> The data I want to sign<br> </Data><br> - <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><br> + <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><br> ...<br> - <Reference URI="#1234"><br> + <Reference URI="#1234"><br> ...<br> </Reference><br> ...<br> @@ -266,7 +266,7 @@ ]><br></code></blockquote> <p> If you are using XML Security Library in your application (not the xmlsec - command line utility!) then you can do a "hack" and tell LibXML2 (and + command line utility!) then you can do a "hack" and tell LibXML2 (and XMLSec) which attributes are ID attributes without providing a DTD by calling <code>xmlAddID</code> function. However, this might make you signature non-interoperable with other XMLDSig implementations. @@ -305,7 +305,7 @@ If you are using xmlsec command line utility then you can use <code>--verification-time <time></code> option (where <code><time></code> is the local system time in the - "<code>YYYY-MM-DD HH:MM:SS</code>" format). + "<code>YYYY-MM-DD HH:MM:SS</code>" format). </p> <h4>3.4. I really like the XMLSec library but it is based on OpenSSL diff --git a/docs/api-0.0.x/xmlsec-man.html b/docs/api-0.0.x/xmlsec-man.html index 140dc8b7..fd61a3e6 100644 --- a/docs/api-0.0.x/xmlsec-man.html +++ b/docs/api-0.0.x/xmlsec-man.html @@ -65,7 +65,7 @@ xmlsec - command line tool to sign and encrypt XML documents </p> <p> -The xmlsec program signs or encrypts XML files, specified on the command line as <i>FILE1</i>, <i>FILE2</i>, ... according to "XML Digital Signature" and "XML Encryption" specifications. +The xmlsec program signs or encrypts XML files, specified on the command line as <i>FILE1</i>, <i>FILE2</i>, ... according to "XML Digital Signature" and "XML Encryption" specifications. </p> <p> </p> @@ -306,7 +306,7 @@ Sets the <i>password</i> to use for reading keys and certificates from PEM files <b>--allowed</b> <i>list</i> </dt> <dd> -Specifies the set of the allowed key origins as a comma separated <i>list</i> of the following values: "keymanager", "keyname", "keyvalue", "retrieval-doc", "retrieval-remote", "enc-key", "x509". By default, all key origins are allowed. +Specifies the set of the allowed key origins as a comma separated <i>list</i> of the following values: "keymanager", "keyname", "keyvalue", "retrieval-doc", "retrieval-remote", "enc-key", "x509". By default, all key origins are allowed. <p> </p> </dd> @@ -450,7 +450,7 @@ Sets the <i>password</i> to use for reading keys and certificates from PEM files <b>--allowed</b> <i>list</i> </dt> <dd> -Specifies the set of the allowed key origins as a comma separated <i>list</i> of the following values: "keymanager", "keyname", "keyvalue", "retrieval-doc", "retrieval-remote", "enc-key", "x509". By default, all key origins are allowed. +Specifies the set of the allowed key origins as a comma separated <i>list</i> of the following values: "keymanager", "keyname", "keyvalue", "retrieval-doc", "retrieval-remote", "enc-key", "x509". By default, all key origins are allowed. <p> </p> </dd> @@ -580,7 +580,7 @@ Sets the <i>password</i> to use for reading keys and certificates from PEM files <b>--allowed</b> <i>list</i> </dt> <dd> -Specifies the set of the allowed key origins as a comma separated <i>list</i> of the following values: "keymanager", "keyname", "keyvalue", "retrieval-doc", "retrieval-remote", "enc-key", "x509". By default, all key origins are allowed. +Specifies the set of the allowed key origins as a comma separated <i>list</i> of the following values: "keymanager", "keyname", "keyvalue", "retrieval-doc", "retrieval-remote", "enc-key", "x509". By default, all key origins are allowed. <p> </p> </dd> @@ -694,7 +694,7 @@ Sets the <i>password</i> to use for reading keys and certificates from PEM files <b>--allowed</b> <i>list</i> </dt> <dd> -Specifies the set of the allowed key origins as a comma separated <i>list</i> of the following values: "keymanager", "keyname", "keyvalue", "retrieval-doc", "retrieval-remote", "enc-key", "x509". By default, all key origins are allowed. +Specifies the set of the allowed key origins as a comma separated <i>list</i> of the following values: "keymanager", "keyname", "keyvalue", "retrieval-doc", "retrieval-remote", "enc-key", "x509". By default, all key origins are allowed. <p> </p> </dd> diff --git a/docs/api-0.0.x/xmlsec-transforms.html b/docs/api-0.0.x/xmlsec-transforms.html index 4d0b4e84..29457d19 100644 --- a/docs/api-0.0.x/xmlsec-transforms.html +++ b/docs/api-0.0.x/xmlsec-transforms.html @@ -186,7 +186,7 @@ void <a href="xmlsec-transforms.html#XMLSECBASE64ENCODESETLINESIZE">xmlSe <a name="AEN3734"></a><h3> <a name="XMLSECTRANSFORMUNKNOWN"></a>xmlSecTransformUnknown</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define xmlSecTransformUnknown NULL</pre></td></tr></table> -<p>The "unknown" transform id (NULL).</p> +<p>The "unknown" transform id (NULL).</p> <p></p> </div> <hr> @@ -314,7 +314,7 @@ void <a href="xmlsec-transforms.html#XMLSECBASE64ENCODESETLINESIZE">xmlSe <a name="AEN3830"></a><h3> <a name="XMLSECTRANSFORMENVELOPED"></a>xmlSecTransformEnveloped</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">extern xmlSecTransformId xmlSecTransformEnveloped;</pre></td></tr></table> -<p>The "enveloped" transform id.</p> +<p>The "enveloped" transform id.</p> <p></p> </div> <hr> @@ -419,7 +419,7 @@ void <a href="xmlsec-transforms.html#XMLSECBASE64ENCODESETLINESIZE">xmlSe <a name="XMLSECC14NEXCLADDINCLNAMESPACES"></a>xmlSecC14NExclAddInclNamespaces ()</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">int xmlSecC14NExclAddInclNamespaces (<strong>xmlNodePtr</strong> transformNode, const <strong>xmlChar</strong> *prefixList);</pre></td></tr></table> -<p>Adds "inclusive" namespaces to the ExcC14N transform node <tt class="PARAMETER"><i>transformNode</i></tt>.</p> +<p>Adds "inclusive" namespaces to the ExcC14N transform node <tt class="PARAMETER"><i>transformNode</i></tt>.</p> <p></p> <div class="INFORMALTABLE"> <a name="AEN3917"></a><p></p> @@ -433,7 +433,7 @@ void <a href="xmlsec-transforms.html#XMLSECBASE64ENCODESETLINESIZE">xmlSe <td width="20%" align="RIGHT" valign="TOP"> <tt class="PARAMETER"><i>prefixList</i></tt> :</td> <td width="80%" align="LEFT" valign="TOP"> the white space delimited list of namespace prefixes, - where "<strong>default</strong>" indicates the default namespace</td> + where "<strong>default</strong>" indicates the default namespace</td> </tr> <tr> <td width="20%" align="RIGHT" valign="TOP"> @@ -600,7 +600,7 @@ node <tt class="PARAMETER"><i>transformNode</i></tt>.</p> <tr> <td width="20%" align="RIGHT" valign="TOP"> <tt class="PARAMETER"><i>type</i></tt> :</td> -<td width="80%" align="LEFT" valign="TOP"> XPath2 transform type ("union", "intersect" or "subtract").</td> +<td width="80%" align="LEFT" valign="TOP"> XPath2 transform type ("union", "intersect" or "subtract").</td> </tr> <tr> <td width="20%" align="RIGHT" valign="TOP"> diff --git a/docs/api-0.0.x/xmlsec-transformsinternal.html b/docs/api-0.0.x/xmlsec-transformsinternal.html index 53ecd3c2..5dcd1f6f 100644 --- a/docs/api-0.0.x/xmlsec-transformsinternal.html +++ b/docs/api-0.0.x/xmlsec-transformsinternal.html @@ -401,7 +401,7 @@ or transform is not found.</td> <a href="xmlsec-transformsinternal.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage, int dontDestroy);</pre></td></tr></table> <p>Reads transform from the <tt class="PARAMETER"><i>transformNode</i></tt> as follows: - 1) reads "Algorithm" attribute; + 1) reads "Algorithm" attribute; 2) checks the list of known algorithms; 3) calls transform create method; 4) calls transform read transform node method.</p> diff --git a/docs/api-0.0.x/xmlsec-version.html b/docs/api-0.0.x/xmlsec-version.html index c476126e..c6eab00f 100644 --- a/docs/api-0.0.x/xmlsec-version.html +++ b/docs/api-0.0.x/xmlsec-version.html @@ -80,9 +80,9 @@ <div class="REFSECT2"> <a name="AEN4361"></a><h3> <a name="XMLSEC-VERSION-CAPS"></a>XMLSEC_VERSION</h3> -<table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define XMLSEC_VERSION "0.0.12"</pre></td></tr></table> +<table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define XMLSEC_VERSION "0.0.12"</pre></td></tr></table> <p>The library version string in the format -"<major-number>.<minor-number>.<sub-minor-number>".</p> +"<major-number>.<minor-number>.<sub-minor-number>".</p> <p></p> </div> <hr> @@ -113,9 +113,9 @@ <div class="REFSECT2"> <a name="AEN4385"></a><h3> <a name="XMLSEC-VERSION-INFO-CAPS"></a>XMLSEC_VERSION_INFO</h3> -<table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define XMLSEC_VERSION_INFO "0:12:0"</pre></td></tr></table> +<table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define XMLSEC_VERSION_INFO "0:12:0"</pre></td></tr></table> <p>The library version info string in the format -"<major-number>+<minor-number>:<sub-minor-number>:<minor-number>".</p> +"<major-number>+<minor-number>:<sub-minor-number>:<minor-number>".</p> <p></p> </div> </div> diff --git a/docs/api/sgml/version.sgml b/docs/api/sgml/version.sgml index f889a907..75c89e04 100644 --- a/docs/api/sgml/version.sgml +++ b/docs/api/sgml/version.sgml @@ -40,7 +40,7 @@ <title>Details</title> <refsect2> <title><anchor id="XMLSEC-VERSION-CAPS">XMLSEC_VERSION</title> -<programlisting>#define XMLSEC_VERSION "1.1.0" +<programlisting>#define XMLSEC_VERSION "1.1.1" </programlisting> <para> The library version string in the format @@ -77,7 +77,7 @@ The library minor version number.</para> </para></refsect2> <refsect2> <title><anchor id="XMLSEC-VERSION-SUBMINOR-CAPS">XMLSEC_VERSION_SUBMINOR</title> -<programlisting>#define XMLSEC_VERSION_SUBMINOR 0 +<programlisting>#define XMLSEC_VERSION_SUBMINOR 1 </programlisting> <para> The library sub-minor version number.</para> @@ -86,7 +86,7 @@ The library sub-minor version number.</para> </para></refsect2> <refsect2> <title><anchor id="XMLSEC-VERSION-INFO-CAPS">XMLSEC_VERSION_INFO</title> -<programlisting>#define XMLSEC_VERSION_INFO "2:0:1" +<programlisting>#define XMLSEC_VERSION_INFO "2:1:1" </programlisting> <para> The library version info string in the format diff --git a/docs/api/xmlsec-custom-keys-manager.html b/docs/api/xmlsec-custom-keys-manager.html index aab01bd3..06c00c80 100644 --- a/docs/api/xmlsec-custom-keys-manager.html +++ b/docs/api/xmlsec-custom-keys-manager.html @@ -114,8 +114,8 @@ main(int argc, char **argv) { assert(argv); if(argc != 2) { - fprintf(stderr, "Error: wrong number of arguments.\n"); - fprintf(stderr, "Usage: %s <enc-file>\n", argv[0]); + fprintf(stderr, "Error: wrong number of arguments.\n"); + fprintf(stderr, "Usage: %s <enc-file>\n", argv[0]); return(1); } @@ -130,19 +130,19 @@ main(int argc, char **argv) { /* Init xmlsec library */ if(xmlSecInit() < 0) { - fprintf(stderr, "Error: xmlsec initialization failed.\n"); + fprintf(stderr, "Error: xmlsec initialization failed.\n"); return(-1); } /* Init crypto library */ if(xmlSecCryptoAppInit(NULL) < 0) { - fprintf(stderr, "Error: crypto initialization failed.\n"); + fprintf(stderr, "Error: crypto initialization failed.\n"); return(-1); } /* Init xmlsec-crypto library */ if(xmlSecCryptoInit() < 0) { - fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); + fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); return(-1); } @@ -201,36 +201,36 @@ decrypt_file(xmlSecKeysMngrPtr mngr, const char* enc_file) { /* load template */ doc = xmlParseFile(enc_file); if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ - fprintf(stderr, "Error: unable to parse file \"%s\"\n", enc_file); + fprintf(stderr, "Error: unable to parse file \"%s\"\n", enc_file); goto done; } /* find start node */ node = xmlSecFindNode(xmlDocGetRootElement(doc), xmlSecNodeEncryptedData, xmlSecEncNs); if(node == NULL) { - fprintf(stderr, "Error: start node not found in \"%s\"\n", enc_file); + fprintf(stderr, "Error: start node not found in \"%s\"\n", enc_file); goto done; } /* create encryption context */ encCtx = xmlSecEncCtxCreate(mngr); if(encCtx == NULL) { - fprintf(stderr,"Error: failed to create encryption context\n"); + fprintf(stderr,"Error: failed to create encryption context\n"); goto done; } /* decrypt the data */ if((xmlSecEncCtxDecrypt(encCtx, node) < 0) || (encCtx->result == NULL)) { - fprintf(stderr,"Error: decryption failed\n"); + fprintf(stderr,"Error: decryption failed\n"); goto done; } /* print decrypted data to stdout */ if(encCtx->resultReplaced != 0) { - fprintf(stdout, "Decrypted XML data:\n"); + fprintf(stdout, "Decrypted XML data:\n"); xmlDocDump(stdout, doc); } else { - fprintf(stdout, "Decrypted binary data (%d bytes):\n", xmlSecBufferGetSize(encCtx->result)); + fprintf(stdout, "Decrypted binary data (%d bytes):\n", xmlSecBufferGetSize(encCtx->result)); if(xmlSecBufferGetData(encCtx->result) != NULL) { fwrite(xmlSecBufferGetData(encCtx->result), 1, @@ -238,7 +238,7 @@ decrypt_file(xmlSecKeysMngrPtr mngr, const char* enc_file) { stdout); } } - fprintf(stdout, "\n"); + fprintf(stdout, "\n"); /* success */ res = 0; @@ -271,21 +271,21 @@ create_files_keys_mngr(void) { /* create files based keys store */ keysStore = xmlSecKeyStoreCreate(files_keys_store_get_klass()); if(keysStore == NULL) { - fprintf(stderr, "Error: failed to create keys store.\n"); + fprintf(stderr, "Error: failed to create keys store.\n"); return(NULL); } /* create keys manager */ mngr = xmlSecKeysMngrCreate(); if(mngr == NULL) { - fprintf(stderr, "Error: failed to create keys manager.\n"); + fprintf(stderr, "Error: failed to create keys manager.\n"); xmlSecKeyStoreDestroy(keysStore); return(NULL); } /* add store to keys manager, from now on keys manager destroys the store if needed */ if(xmlSecKeysMngrAdoptKeysStore(mngr, keysStore) < 0) { - fprintf(stderr, "Error: failed to add keys store to keys manager.\n"); + fprintf(stderr, "Error: failed to add keys store to keys manager.\n"); xmlSecKeyStoreDestroy(keysStore); xmlSecKeysMngrDestroy(mngr); return(NULL); @@ -293,7 +293,7 @@ create_files_keys_mngr(void) { /* initialize crypto library specific data in keys manager */ if(xmlSecCryptoKeysMngrInit(mngr) < 0) { - fprintf(stderr, "Error: failed to initialize crypto data in keys manager.\n"); + fprintf(stderr, "Error: failed to initialize crypto data in keys manager.\n"); xmlSecKeysMngrDestroy(mngr); return(NULL); } @@ -317,7 +317,7 @@ static xmlSecKeyPtr files_keys_store_find_key (xmlSecKeyStorePtr store, static xmlSecKeyStoreKlass files_keys_store_klass = { sizeof(xmlSecKeyStoreKlass), sizeof(xmlSecKeyStore), - BAD_CAST "files-based-keys-store", /* const xmlChar* name; */ + BAD_CAST "files-based-keys-store", /* const xmlChar* name; */ NULL, /* xmlSecKeyStoreInitializeMethod initialize; */ NULL, /* xmlSecKeyStoreFinalizeMethod finalize; */ files_keys_store_find_key, /* xmlSecKeyStoreFindKeyMethod findKey; */ @@ -365,7 +365,7 @@ files_keys_store_find_key(xmlSecKeyStorePtr store, const xmlChar* name, xmlSecKe return(NULL); } - /* we don't want to open files in a folder other than "current"; + /* we don't want to open files in a folder other than "current"; * to prevent it limit the characters in the key name to alpha/digit, * '.', '-' or '_'. */ @@ -379,21 +379,21 @@ files_keys_store_find_key(xmlSecKeyStorePtr store, const xmlChar* name, xmlSecKe /* load key from a pem file, if key is not found then it's an error (is it?) */ key = xmlSecCryptoAppKeyLoad(name, xmlSecKeyDataFormatPem, NULL, NULL, NULL); if(key == NULL) { - fprintf(stderr,"Error: failed to load public pem key from \"%s\"\n", name); + fprintf(stderr,"Error: failed to load public pem key from \"%s\"\n", name); return(NULL); } } else { /* otherwise it's a binary key, if key is not found then it's an error (is it?) */ key = xmlSecKeyReadBinaryFile(keyInfoCtx->keyReq.keyId, name); if(key == NULL) { - fprintf(stderr,"Error: failed to load key from binary file \"%s\"\n", name); + fprintf(stderr,"Error: failed to load key from binary file \"%s\"\n", name); return(NULL); } } /* set key name */ if(xmlSecKeySetName(key, name) < 0) { - fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", name); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", name); xmlSecKeyDestroy(key); return(NULL); } diff --git a/docs/api/xmlsec-decrypt-with-keys-mngr.html b/docs/api/xmlsec-decrypt-with-keys-mngr.html index 536ec57d..6de4f0ab 100644 --- a/docs/api/xmlsec-decrypt-with-keys-mngr.html +++ b/docs/api/xmlsec-decrypt-with-keys-mngr.html @@ -111,8 +111,8 @@ main(int argc, char **argv) { assert(argv); if(argc != 3) { - fprintf(stderr, "Error: wrong number of arguments.\n"); - fprintf(stderr, "Usage: %s <enc-file> <key-file1> [<key-file2> [...]]\n", argv[0]); + fprintf(stderr, "Error: wrong number of arguments.\n"); + fprintf(stderr, "Usage: %s <enc-file> <key-file1> [<key-file2> [...]]\n", argv[0]); return(1); } @@ -127,19 +127,19 @@ main(int argc, char **argv) { /* Init xmlsec library */ if(xmlSecInit() < 0) { - fprintf(stderr, "Error: xmlsec initialization failed.\n"); + fprintf(stderr, "Error: xmlsec initialization failed.\n"); return(-1); } /* Init crypto library */ if(xmlSecCryptoAppInit(NULL) < 0) { - fprintf(stderr, "Error: crypto initialization failed.\n"); + fprintf(stderr, "Error: crypto initialization failed.\n"); return(-1); } /* Init xmlsec-crypto library */ if(xmlSecCryptoInit() < 0) { - fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); + fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); return(-1); } @@ -202,11 +202,11 @@ load_des_keys(char** files, int files_size) { */ mngr = xmlSecKeysMngrCreate(); if(mngr == NULL) { - fprintf(stderr, "Error: failed to create keys manager.\n"); + fprintf(stderr, "Error: failed to create keys manager.\n"); return(NULL); } if(xmlSecCryptoAppDefaultKeysMngrInit(mngr) < 0) { - fprintf(stderr, "Error: failed to initialize keys manager.\n"); + fprintf(stderr, "Error: failed to initialize keys manager.\n"); xmlSecKeysMngrDestroy(mngr); return(NULL); } @@ -217,14 +217,14 @@ load_des_keys(char** files, int files_size) { /* load DES key */ key = xmlSecKeyReadBinaryFile(xmlSecKeyDataDesId, files[i]); if(key == NULL) { - fprintf(stderr,"Error: failed to load des key from binary file \"%s\"\n", files[i]); + fprintf(stderr,"Error: failed to load des key from binary file \"%s\"\n", files[i]); xmlSecKeysMngrDestroy(mngr); return(NULL); } /* set key name to the file name, this is just an example! */ if(xmlSecKeySetName(key, BAD_CAST files[i]) < 0) { - fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", files[i]); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", files[i]); xmlSecKeyDestroy(key); xmlSecKeysMngrDestroy(mngr); return(NULL); @@ -234,7 +234,7 @@ load_des_keys(char** files, int files_size) { * for destroying key */ if(xmlSecCryptoAppDefaultKeysMngrAdoptKey(mngr, key) < 0) { - fprintf(stderr,"Error: failed to add key from \"%s\" to keys manager\n", files[i]); + fprintf(stderr,"Error: failed to add key from \"%s\" to keys manager\n", files[i]); xmlSecKeyDestroy(key); xmlSecKeysMngrDestroy(mngr); return(NULL); @@ -267,36 +267,36 @@ decrypt_file(xmlSecKeysMngrPtr mngr, const char* enc_file) { /* load template */ doc = xmlParseFile(enc_file); if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ - fprintf(stderr, "Error: unable to parse file \"%s\"\n", enc_file); + fprintf(stderr, "Error: unable to parse file \"%s\"\n", enc_file); goto done; } /* find start node */ node = xmlSecFindNode(xmlDocGetRootElement(doc), xmlSecNodeEncryptedData, xmlSecEncNs); if(node == NULL) { - fprintf(stderr, "Error: start node not found in \"%s\"\n", enc_file); + fprintf(stderr, "Error: start node not found in \"%s\"\n", enc_file); goto done; } /* create encryption context */ encCtx = xmlSecEncCtxCreate(mngr); if(encCtx == NULL) { - fprintf(stderr,"Error: failed to create encryption context\n"); + fprintf(stderr,"Error: failed to create encryption context\n"); goto done; } /* decrypt the data */ if((xmlSecEncCtxDecrypt(encCtx, node) < 0) || (encCtx->result == NULL)) { - fprintf(stderr,"Error: decryption failed\n"); + fprintf(stderr,"Error: decryption failed\n"); goto done; } /* print decrypted data to stdout */ if(encCtx->resultReplaced != 0) { - fprintf(stdout, "Decrypted XML data:\n"); + fprintf(stdout, "Decrypted XML data:\n"); xmlDocDump(stdout, doc); } else { - fprintf(stdout, "Decrypted binary data (%d bytes):\n", xmlSecBufferGetSize(encCtx->result)); + fprintf(stdout, "Decrypted binary data (%d bytes):\n", xmlSecBufferGetSize(encCtx->result)); if(xmlSecBufferGetData(encCtx->result) != NULL) { fwrite(xmlSecBufferGetData(encCtx->result), 1, @@ -304,7 +304,7 @@ decrypt_file(xmlSecKeysMngrPtr mngr, const char* enc_file) { stdout); } } - fprintf(stdout, "\n"); + fprintf(stdout, "\n"); /* success */ res = 0; diff --git a/docs/api/xmlsec-decrypt-with-signle-key.html b/docs/api/xmlsec-decrypt-with-signle-key.html index 0bc167b0..3472dd69 100644 --- a/docs/api/xmlsec-decrypt-with-signle-key.html +++ b/docs/api/xmlsec-decrypt-with-signle-key.html @@ -107,8 +107,8 @@ main(int argc, char **argv) { assert(argv); if(argc != 3) { - fprintf(stderr, "Error: wrong number of arguments.\n"); - fprintf(stderr, "Usage: %s <enc-file> <key-file>\n", argv[0]); + fprintf(stderr, "Error: wrong number of arguments.\n"); + fprintf(stderr, "Usage: %s <enc-file> <key-file>\n", argv[0]); return(1); } @@ -123,19 +123,19 @@ main(int argc, char **argv) { /* Init xmlsec library */ if(xmlSecInit() < 0) { - fprintf(stderr, "Error: xmlsec initialization failed.\n"); + fprintf(stderr, "Error: xmlsec initialization failed.\n"); return(-1); } /* Init crypto library */ if(xmlSecCryptoAppInit(NULL) < 0) { - fprintf(stderr, "Error: crypto initialization failed.\n"); + fprintf(stderr, "Error: crypto initialization failed.\n"); return(-1); } /* Init xmlsec-crypto library */ if(xmlSecCryptoInit() < 0) { - fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); + fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); return(-1); } @@ -184,49 +184,49 @@ decrypt_file(const char* enc_file, const char* key_file) { /* load template */ doc = xmlParseFile(enc_file); if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ - fprintf(stderr, "Error: unable to parse file \"%s\"\n", enc_file); + fprintf(stderr, "Error: unable to parse file \"%s\"\n", enc_file); goto done; } /* find start node */ node = xmlSecFindNode(xmlDocGetRootElement(doc), xmlSecNodeEncryptedData, xmlSecEncNs); if(node == NULL) { - fprintf(stderr, "Error: start node not found in \"%s\"\n", enc_file); + fprintf(stderr, "Error: start node not found in \"%s\"\n", enc_file); goto done; } /* create encryption context, we don't need keys manager in this example */ encCtx = xmlSecEncCtxCreate(NULL); if(encCtx == NULL) { - fprintf(stderr,"Error: failed to create encryption context\n"); + fprintf(stderr,"Error: failed to create encryption context\n"); goto done; } /* load DES key */ encCtx->encKey = xmlSecKeyReadBinaryFile(xmlSecKeyDataDesId, key_file); if(encCtx->encKey == NULL) { - fprintf(stderr,"Error: failed to load des key from binary file \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to load des key from binary file \"%s\"\n", key_file); goto done; } /* set key name to the file name, this is just an example! */ if(xmlSecKeySetName(encCtx->encKey, key_file) < 0) { - fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); goto done; } /* decrypt the data */ if((xmlSecEncCtxDecrypt(encCtx, node) < 0) || (encCtx->result == NULL)) { - fprintf(stderr,"Error: decryption failed\n"); + fprintf(stderr,"Error: decryption failed\n"); goto done; } /* print decrypted data to stdout */ if(encCtx->resultReplaced != 0) { - fprintf(stdout, "Decrypted XML data:\n"); + fprintf(stdout, "Decrypted XML data:\n"); xmlDocDump(stdout, doc); } else { - fprintf(stdout, "Decrypted binary data (%d bytes):\n", xmlSecBufferGetSize(encCtx->result)); + fprintf(stdout, "Decrypted binary data (%d bytes):\n", xmlSecBufferGetSize(encCtx->result)); if(xmlSecBufferGetData(encCtx->result) != NULL) { fwrite(xmlSecBufferGetData(encCtx->result), 1, @@ -234,7 +234,7 @@ decrypt_file(const char* enc_file, const char* key_file) { stdout); } } - fprintf(stdout, "\n"); + fprintf(stdout, "\n"); /* success */ res = 0; diff --git a/docs/api/xmlsec-encrypt-dynamic-template.html b/docs/api/xmlsec-encrypt-dynamic-template.html index d2f7b7be..26555c64 100644 --- a/docs/api/xmlsec-encrypt-dynamic-template.html +++ b/docs/api/xmlsec-encrypt-dynamic-template.html @@ -111,8 +111,8 @@ main(int argc, char **argv) { assert(argv); if(argc != 3) { - fprintf(stderr, "Error: wrong number of arguments.\n"); - fprintf(stderr, "Usage: %s <xml-file> <key-file>\n", argv[0]); + fprintf(stderr, "Error: wrong number of arguments.\n"); + fprintf(stderr, "Usage: %s <xml-file> <key-file>\n", argv[0]); return(1); } @@ -127,19 +127,19 @@ main(int argc, char **argv) { /* Init xmlsec library */ if(xmlSecInit() < 0) { - fprintf(stderr, "Error: xmlsec initialization failed.\n"); + fprintf(stderr, "Error: xmlsec initialization failed.\n"); return(-1); } /* Init crypto library */ if(xmlSecCryptoAppInit(NULL) < 0) { - fprintf(stderr, "Error: crypto initialization failed.\n"); + fprintf(stderr, "Error: crypto initialization failed.\n"); return(-1); } /* Init xmlsec-crypto library */ if(xmlSecCryptoInit() < 0) { - fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); + fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); return(-1); } @@ -189,7 +189,7 @@ encrypt_file(const char* xml_file, const char* key_file) { /* load template */ doc = xmlParseFile(xml_file); if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ - fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); + fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); goto done; } @@ -198,51 +198,51 @@ encrypt_file(const char* xml_file, const char* key_file) { encDataNode = xmlSecTmplEncDataCreate(doc, xmlSecTransformDes3CbcId, NULL, xmlSecTypeEncElement, NULL, NULL); if(encDataNode == NULL) { - fprintf(stderr, "Error: failed to create encryption template\n"); + fprintf(stderr, "Error: failed to create encryption template\n"); goto done; } /* we want to put encrypted data in the <enc:CipherValue/> node */ if(xmlSecTmplEncDataEnsureCipherValue(encDataNode) == NULL) { - fprintf(stderr, "Error: failed to add CipherValue node\n"); + fprintf(stderr, "Error: failed to add CipherValue node\n"); goto done; } /* add <dsig:KeyInfo/> and <dsig:KeyName/> nodes to put key name in the signed document */ keyInfoNode = xmlSecTmplEncDataEnsureKeyInfo(encDataNode, NULL); if(keyInfoNode == NULL) { - fprintf(stderr, "Error: failed to add key info\n"); + fprintf(stderr, "Error: failed to add key info\n"); goto done; } if(xmlSecTmplKeyInfoAddKeyName(keyInfoNode, NULL) == NULL) { - fprintf(stderr, "Error: failed to add key name\n"); + fprintf(stderr, "Error: failed to add key name\n"); goto done; } /* create encryption context, we don't need keys manager in this example */ encCtx = xmlSecEncCtxCreate(NULL); if(encCtx == NULL) { - fprintf(stderr,"Error: failed to create encryption context\n"); + fprintf(stderr,"Error: failed to create encryption context\n"); goto done; } /* load DES key, assuming that there is not password */ encCtx->encKey = xmlSecKeyReadBinaryFile(xmlSecKeyDataDesId, key_file); if(encCtx->encKey == NULL) { - fprintf(stderr,"Error: failed to load des key from binary file \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to load des key from binary file \"%s\"\n", key_file); goto done; } /* set key name to the file name, this is just an example! */ if(xmlSecKeySetName(encCtx->encKey, key_file) < 0) { - fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); goto done; } /* encrypt the data */ if(xmlSecEncCtxXmlEncrypt(encCtx, encDataNode, xmlDocGetRootElement(doc)) < 0) { - fprintf(stderr,"Error: encryption failed\n"); + fprintf(stderr,"Error: encryption failed\n"); goto done; } @@ -280,11 +280,11 @@ done: <p></p> <div class="INFORMALEXAMPLE"> <a name="AEN755"></a><p></p> -<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> +<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> <!-- XML Security Library example: Original XML doc file before encryption (encrypt2 example). --> -<Envelope xmlns="urn:envelope"> +<Envelope xmlns="urn:envelope"> <Data> Hello, World! </Data> @@ -298,13 +298,13 @@ XML Security Library example: Original XML doc file before encryption (encrypt2 <p></p> <div class="INFORMALEXAMPLE"> <a name="AEN760"></a><p></p> -<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> +<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> <!-- XML Security Library example: Encrypted XML file (encrypt2 example). --> -<EncryptedData xmlns="http://www.w3.org/2001/04/xmlenc#" Type="http://www.w3.org/2001/04/xmlenc#Element"> -<EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/> -<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> +<EncryptedData xmlns="http://www.w3.org/2001/04/xmlenc#" Type="http://www.w3.org/2001/04/xmlenc#Element"> +<EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/> +<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> <KeyName>deskey.bin</KeyName> </KeyInfo> <CipherData> diff --git a/docs/api/xmlsec-encrypt-template-file.html b/docs/api/xmlsec-encrypt-template-file.html index 19f02266..13f9654e 100644 --- a/docs/api/xmlsec-encrypt-template-file.html +++ b/docs/api/xmlsec-encrypt-template-file.html @@ -106,13 +106,13 @@ int encrypt_file(const char* tmpl_file, const char* key_file, const unsigned char* data, size_t dataSize); int main(int argc, char **argv) { - static const char secret_data[] = "Big secret"; + static const char secret_data[] = "Big secret"; assert(argv); if(argc != 3) { - fprintf(stderr, "Error: wrong number of arguments.\n"); - fprintf(stderr, "Usage: %s <tmpl-file> <key-file>\n", argv[0]); + fprintf(stderr, "Error: wrong number of arguments.\n"); + fprintf(stderr, "Usage: %s <tmpl-file> <key-file>\n", argv[0]); return(1); } @@ -127,19 +127,19 @@ main(int argc, char **argv) { /* Init xmlsec library */ if(xmlSecInit() < 0) { - fprintf(stderr, "Error: xmlsec initialization failed.\n"); + fprintf(stderr, "Error: xmlsec initialization failed.\n"); return(-1); } /* Init crypto library */ if(xmlSecCryptoAppInit(NULL) < 0) { - fprintf(stderr, "Error: crypto initialization failed.\n"); + fprintf(stderr, "Error: crypto initialization failed.\n"); return(-1); } /* Init xmlsec-crypto library */ if(xmlSecCryptoInit() < 0) { - fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); + fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); return(-1); } @@ -192,40 +192,40 @@ encrypt_file(const char* tmpl_file, const char* key_file, /* load template */ doc = xmlParseFile(tmpl_file); if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ - fprintf(stderr, "Error: unable to parse file \"%s\"\n", tmpl_file); + fprintf(stderr, "Error: unable to parse file \"%s\"\n", tmpl_file); goto done; } /* find start node */ node = xmlSecFindNode(xmlDocGetRootElement(doc), xmlSecNodeEncryptedData, xmlSecEncNs); if(node == NULL) { - fprintf(stderr, "Error: start node not found in \"%s\"\n", tmpl_file); + fprintf(stderr, "Error: start node not found in \"%s\"\n", tmpl_file); goto done; } /* create encryption context, we don't need keys manager in this example */ encCtx = xmlSecEncCtxCreate(NULL); if(encCtx == NULL) { - fprintf(stderr,"Error: failed to create encryption context\n"); + fprintf(stderr,"Error: failed to create encryption context\n"); goto done; } /* load DES key, assuming that there is not password */ encCtx->encKey = xmlSecKeyReadBinaryFile(xmlSecKeyDataDesId, key_file); if(encCtx->encKey == NULL) { - fprintf(stderr,"Error: failed to load des key from binary file \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to load des key from binary file \"%s\"\n", key_file); goto done; } /* set key name to the file name, this is just an example! */ if(xmlSecKeySetName(encCtx->encKey, key_file) < 0) { - fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); goto done; } /* encrypt the data */ if(xmlSecEncCtxBinaryEncrypt(encCtx, node, data, dataSize) < 0) { - fprintf(stderr,"Error: encryption failed\n"); + fprintf(stderr,"Error: encryption failed\n"); goto done; } @@ -256,13 +256,13 @@ done: <p></p> <div class="INFORMALEXAMPLE"> <a name="AEN738"></a><p></p> -<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0"?> +<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0"?> <!-- XML Security Library example: Simple encryption template file for encrypt1 example. --> -<EncryptedData xmlns="http://www.w3.org/2001/04/xmlenc#"> - <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/> - <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> +<EncryptedData xmlns="http://www.w3.org/2001/04/xmlenc#"> + <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/> + <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> <KeyName/> </KeyInfo> <CipherData> @@ -278,13 +278,13 @@ XML Security Library example: Simple encryption template file for encrypt1 examp <p></p> <div class="INFORMALEXAMPLE"> <a name="AEN743"></a><p></p> -<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0"?> +<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0"?> <!-- XML Security Library example: Encrypted binary data (encrypt1 example). --> -<EncryptedData xmlns="http://www.w3.org/2001/04/xmlenc#"> - <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/> - <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> +<EncryptedData xmlns="http://www.w3.org/2001/04/xmlenc#"> + <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/> + <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> <KeyName>deskey.bin</KeyName> </KeyInfo> <CipherData> diff --git a/docs/api/xmlsec-encrypt-with-session-key.html b/docs/api/xmlsec-encrypt-with-session-key.html index 950c5bac..112f4baf 100644 --- a/docs/api/xmlsec-encrypt-with-session-key.html +++ b/docs/api/xmlsec-encrypt-with-session-key.html @@ -114,8 +114,8 @@ main(int argc, char **argv) { assert(argv); if(argc != 3) { - fprintf(stderr, "Error: wrong number of arguments.\n"); - fprintf(stderr, "Usage: %s <xml-file> <key-file>\n", argv[0]); + fprintf(stderr, "Error: wrong number of arguments.\n"); + fprintf(stderr, "Usage: %s <xml-file> <key-file>\n", argv[0]); return(1); } @@ -130,19 +130,19 @@ main(int argc, char **argv) { /* Init xmlsec library */ if(xmlSecInit() < 0) { - fprintf(stderr, "Error: xmlsec initialization failed.\n"); + fprintf(stderr, "Error: xmlsec initialization failed.\n"); return(-1); } /* Init crypto library */ if(xmlSecCryptoAppInit(NULL) < 0) { - fprintf(stderr, "Error: crypto initialization failed.\n"); + fprintf(stderr, "Error: crypto initialization failed.\n"); return(-1); } /* Init xmlsec-crypto library */ if(xmlSecCryptoInit() < 0) { - fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); + fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); return(-1); } @@ -203,11 +203,11 @@ load_rsa_keys(char* key_file) { */ mngr = xmlSecKeysMngrCreate(); if(mngr == NULL) { - fprintf(stderr, "Error: failed to create keys manager.\n"); + fprintf(stderr, "Error: failed to create keys manager.\n"); return(NULL); } if(xmlSecCryptoAppDefaultKeysMngrInit(mngr) < 0) { - fprintf(stderr, "Error: failed to initialize keys manager.\n"); + fprintf(stderr, "Error: failed to initialize keys manager.\n"); xmlSecKeysMngrDestroy(mngr); return(NULL); } @@ -215,14 +215,14 @@ load_rsa_keys(char* key_file) { /* load private RSA key */ key = xmlSecCryptoAppKeyLoad(key_file, xmlSecKeyDataFormatPem, NULL, NULL, NULL); if(key == NULL) { - fprintf(stderr,"Error: failed to load rsa key from file \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to load rsa key from file \"%s\"\n", key_file); xmlSecKeysMngrDestroy(mngr); return(NULL); } /* set key name to the file name, this is just an example! */ if(xmlSecKeySetName(key, BAD_CAST key_file) < 0) { - fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); xmlSecKeyDestroy(key); xmlSecKeysMngrDestroy(mngr); return(NULL); @@ -232,7 +232,7 @@ load_rsa_keys(char* key_file) { * for destroying key */ if(xmlSecCryptoAppDefaultKeysMngrAdoptKey(mngr, key) < 0) { - fprintf(stderr,"Error: failed to add key from \"%s\" to keys manager\n", key_file); + fprintf(stderr,"Error: failed to add key from \"%s\" to keys manager\n", key_file); xmlSecKeyDestroy(key); xmlSecKeysMngrDestroy(mngr); return(NULL); @@ -269,7 +269,7 @@ encrypt_file(xmlSecKeysMngrPtr mngr, const char* xml_file, const char* key_name) /* load template */ doc = xmlParseFile(xml_file); if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ - fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); + fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); goto done; } @@ -278,20 +278,20 @@ encrypt_file(xmlSecKeysMngrPtr mngr, const char* xml_file, const char* key_name) encDataNode = xmlSecTmplEncDataCreate(doc, xmlSecTransformDes3CbcId, NULL, xmlSecTypeEncElement, NULL, NULL); if(encDataNode == NULL) { - fprintf(stderr, "Error: failed to create encryption template\n"); + fprintf(stderr, "Error: failed to create encryption template\n"); goto done; } /* we want to put encrypted data in the <enc:CipherValue/> node */ if(xmlSecTmplEncDataEnsureCipherValue(encDataNode) == NULL) { - fprintf(stderr, "Error: failed to add CipherValue node\n"); + fprintf(stderr, "Error: failed to add CipherValue node\n"); goto done; } /* add <dsig:KeyInfo/> */ keyInfoNode = xmlSecTmplEncDataEnsureKeyInfo(encDataNode, NULL); if(keyInfoNode == NULL) { - fprintf(stderr, "Error: failed to add key info\n"); + fprintf(stderr, "Error: failed to add key info\n"); goto done; } @@ -300,46 +300,46 @@ encrypt_file(xmlSecKeysMngrPtr mngr, const char* xml_file, const char* key_name) xmlSecTransformRsaOaepId, NULL, NULL, NULL); if(encKeyNode == NULL) { - fprintf(stderr, "Error: failed to add key info\n"); + fprintf(stderr, "Error: failed to add key info\n"); goto done; } /* we want to put encrypted key in the <enc:CipherValue/> node */ if(xmlSecTmplEncDataEnsureCipherValue(encKeyNode) == NULL) { - fprintf(stderr, "Error: failed to add CipherValue node\n"); + fprintf(stderr, "Error: failed to add CipherValue node\n"); goto done; } /* add <dsig:KeyInfo/> and <dsig:KeyName/> nodes to <enc:EncryptedKey/> */ keyInfoNode2 = xmlSecTmplEncDataEnsureKeyInfo(encKeyNode, NULL); if(keyInfoNode2 == NULL) { - fprintf(stderr, "Error: failed to add key info\n"); + fprintf(stderr, "Error: failed to add key info\n"); goto done; } /* set key name so we can lookup key when needed */ if(xmlSecTmplKeyInfoAddKeyName(keyInfoNode2, key_name) == NULL) { - fprintf(stderr, "Error: failed to add key name\n"); + fprintf(stderr, "Error: failed to add key name\n"); goto done; } /* create encryption context */ encCtx = xmlSecEncCtxCreate(mngr); if(encCtx == NULL) { - fprintf(stderr,"Error: failed to create encryption context\n"); + fprintf(stderr,"Error: failed to create encryption context\n"); goto done; } /* generate a Triple DES key */ encCtx->encKey = xmlSecKeyGenerate(xmlSecKeyDataDesId, 192, xmlSecKeyDataTypeSession); if(encCtx->encKey == NULL) { - fprintf(stderr,"Error: failed to generate session des key\n"); + fprintf(stderr,"Error: failed to generate session des key\n"); goto done; } /* encrypt the data */ if(xmlSecEncCtxXmlEncrypt(encCtx, encDataNode, xmlDocGetRootElement(doc)) < 0) { - fprintf(stderr,"Error: encryption failed\n"); + fprintf(stderr,"Error: encryption failed\n"); goto done; } @@ -377,11 +377,11 @@ done: <p></p> <div class="INFORMALEXAMPLE"> <a name="AEN772"></a><p></p> -<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> +<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> <!-- XML Security Library example: Original XML doc file before encryption (encrypt3 example). --> -<Envelope xmlns="urn:envelope"> +<Envelope xmlns="urn:envelope"> <Data> Hello, World! </Data> @@ -395,16 +395,16 @@ XML Security Library example: Original XML doc file before encryption (encrypt3 <p></p> <div class="INFORMALEXAMPLE"> <a name="AEN777"></a><p></p> -<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> +<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> <!-- XML Security Library example: XML doc file encrypted with a session DES key (encrypt3 example). --> -<EncryptedData xmlns="http://www.w3.org/2001/04/xmlenc#" Type="http://www.w3.org/2001/04/xmlenc#Element"> -<EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/> -<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> -<EncryptedKey xmlns="http://www.w3.org/2001/04/xmlenc#"> -<EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/> -<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> +<EncryptedData xmlns="http://www.w3.org/2001/04/xmlenc#" Type="http://www.w3.org/2001/04/xmlenc#Element"> +<EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/> +<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> +<EncryptedKey xmlns="http://www.w3.org/2001/04/xmlenc#"> +<EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/> +<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> <KeyName>rsakey.pem</KeyName> </KeyInfo> <CipherData> diff --git a/docs/api/xmlsec-errors.html b/docs/api/xmlsec-errors.html index 7d67bdfe..cb7f1343 100644 --- a/docs/api/xmlsec-errors.html +++ b/docs/api/xmlsec-errors.html @@ -497,7 +497,7 @@ in the <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod" target=" <a name="AEN1972"></a><h3> <a name="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID-CAPS"></a>XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_CERT_NOT_YET_VALID 75</pre></td></tr></table> -<p>"Not valid before" verification failed.</p> +<p>"Not valid before" verification failed.</p> <p></p> </div> <hr> @@ -505,7 +505,7 @@ in the <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod" target=" <a name="AEN1978"></a><h3> <a name="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED-CAPS"></a>XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_CERT_HAS_EXPIRED 76</pre></td></tr></table> -<p>"Not valid after" verification failed.</p> +<p>"Not valid after" verification failed.</p> <p></p> </div> <hr> @@ -732,7 +732,7 @@ for the <a href="xmlsec-errors.html#XMLSECERROR">xmlSecError</a>() function.</p> <a name="AEN2180"></a><h3> <a name="XMLSECERRORSSAFESTRING"></a>xmlSecErrorsSafeString()</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define xmlSecErrorsSafeString(str)</pre></td></tr></table> -<p>Macro. Returns <tt class="PARAMETER"><i>str</i></tt> if it is not NULL or pointer to "NULL" otherwise.</p> +<p>Macro. Returns <tt class="PARAMETER"><i>str</i></tt> if it is not NULL or pointer to "NULL" otherwise.</p> <p></p> <p></p> <table class="VARIABLELIST" border="0" cellspacing="0" cellpadding="4" width="100%" bgcolor="#FFD0D0"><tbody><tr> @@ -744,8 +744,8 @@ for the <a href="xmlsec-errors.html#XMLSECERROR">xmlSecError</a>() function.</p> <div class="REFSECT2"> <a name="AEN2193"></a><h3> <a name="XMLSEC-ERRORS-NO-MESSAGE-CAPS"></a>XMLSEC_ERRORS_NO_MESSAGE</h3> -<table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_NO_MESSAGE " "</pre></td></tr></table> -<p>Empty error message " ".</p> +<table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_NO_MESSAGE " "</pre></td></tr></table> +<p>Empty error message " ".</p> <p></p> </div> <hr> diff --git a/docs/api/xmlsec-examples-sign-dynamimc-template.html b/docs/api/xmlsec-examples-sign-dynamimc-template.html index 7316cb6d..99f76435 100644 --- a/docs/api/xmlsec-examples-sign-dynamimc-template.html +++ b/docs/api/xmlsec-examples-sign-dynamimc-template.html @@ -112,8 +112,8 @@ main(int argc, char **argv) { assert(argv); if(argc != 3) { - fprintf(stderr, "Error: wrong number of arguments.\n"); - fprintf(stderr, "Usage: %s <xml-file> <key-file>\n", argv[0]); + fprintf(stderr, "Error: wrong number of arguments.\n"); + fprintf(stderr, "Usage: %s <xml-file> <key-file>\n", argv[0]); return(1); } @@ -128,19 +128,19 @@ main(int argc, char **argv) { /* Init xmlsec library */ if(xmlSecInit() < 0) { - fprintf(stderr, "Error: xmlsec initialization failed.\n"); + fprintf(stderr, "Error: xmlsec initialization failed.\n"); return(-1); } /* Init crypto library */ if(xmlSecCryptoAppInit(NULL) < 0) { - fprintf(stderr, "Error: crypto initialization failed.\n"); + fprintf(stderr, "Error: crypto initialization failed.\n"); return(-1); } /* Init xmlsec-crypto library */ if(xmlSecCryptoInit() < 0) { - fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); + fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); return(-1); } @@ -191,7 +191,7 @@ sign_file(const char* xml_file, const char* key_file) { /* load doc file */ doc = xmlParseFile(xml_file); if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ - fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); + fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); goto done; } @@ -199,7 +199,7 @@ sign_file(const char* xml_file, const char* key_file) { signNode = xmlSecTmplSignatureCreate(doc, xmlSecTransformExclC14NId, xmlSecTransformRsaSha1Id, NULL); if(signNode == NULL) { - fprintf(stderr, "Error: failed to create signature template\n"); + fprintf(stderr, "Error: failed to create signature template\n"); goto done; } @@ -210,51 +210,51 @@ sign_file(const char* xml_file, const char* key_file) { refNode = xmlSecTmplSignatureAddReference(signNode, xmlSecTransformSha1Id, NULL, NULL, NULL); if(refNode == NULL) { - fprintf(stderr, "Error: failed to add reference to signature template\n"); + fprintf(stderr, "Error: failed to add reference to signature template\n"); goto done; } /* add enveloped transform */ if(xmlSecTmplReferenceAddTransform(refNode, xmlSecTransformEnvelopedId) == NULL) { - fprintf(stderr, "Error: failed to add enveloped transform to reference\n"); + fprintf(stderr, "Error: failed to add enveloped transform to reference\n"); goto done; } /* add <dsig:KeyInfo/> and <dsig:KeyName/> nodes to put key name in the signed document */ keyInfoNode = xmlSecTmplSignatureEnsureKeyInfo(signNode, NULL); if(keyInfoNode == NULL) { - fprintf(stderr, "Error: failed to add key info\n"); + fprintf(stderr, "Error: failed to add key info\n"); goto done; } if(xmlSecTmplKeyInfoAddKeyName(keyInfoNode, NULL) == NULL) { - fprintf(stderr, "Error: failed to add key name\n"); + fprintf(stderr, "Error: failed to add key name\n"); 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"); + fprintf(stderr,"Error: failed to create signature context\n"); goto done; } /* load private key, assuming that there is not password */ dsigCtx->signKey = xmlSecCryptoAppKeyLoad(key_file, xmlSecKeyDataFormatPem, NULL, NULL, NULL); if(dsigCtx->signKey == NULL) { - fprintf(stderr,"Error: failed to load private pem key from \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to load private pem key from \"%s\"\n", key_file); 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); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); goto done; } /* sign the template */ if(xmlSecDSigCtxSign(dsigCtx, signNode) < 0) { - fprintf(stderr,"Error: signature failed\n"); + fprintf(stderr,"Error: signature failed\n"); goto done; } @@ -284,11 +284,11 @@ done: <p></p> <div class="INFORMALEXAMPLE"> <a name="AEN656"></a><p></p> -<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> +<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> <!-- XML Security Library example: Original XML doc file for sign2 example. --> -<Envelope xmlns="urn:envelope"> +<Envelope xmlns="urn:envelope"> <Data> Hello, World! </Data> @@ -302,23 +302,23 @@ XML Security Library example: Original XML doc file for sign2 example. <p></p> <div class="INFORMALEXAMPLE"> <a name="AEN661"></a><p></p> -<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> +<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> <!-- XML Security Library example: Signed XML doc file (sign2 example). --> -<Envelope xmlns="urn:envelope"> +<Envelope xmlns="urn:envelope"> <Data> Hello, World! </Data> -<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"> +<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"> <SignedInfo> -<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> -<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> +<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> +<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> <Reference> <Transforms> -<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/> +<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/> </Transforms> -<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> +<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> <DigestValue>HjY8ilZAIEM2tBbPn5mYO1ieIX4=</DigestValue> </Reference> </SignedInfo> diff --git a/docs/api/xmlsec-examples-sign-template-file.html b/docs/api/xmlsec-examples-sign-template-file.html index fedf7416..3f8b3681 100644 --- a/docs/api/xmlsec-examples-sign-template-file.html +++ b/docs/api/xmlsec-examples-sign-template-file.html @@ -109,8 +109,8 @@ main(int argc, char **argv) { assert(argv); if(argc != 3) { - fprintf(stderr, "Error: wrong number of arguments.\n"); - fprintf(stderr, "Usage: %s <tmpl-file> <key-file>\n", argv[0]); + fprintf(stderr, "Error: wrong number of arguments.\n"); + fprintf(stderr, "Usage: %s <tmpl-file> <key-file>\n", argv[0]); return(1); } @@ -125,19 +125,19 @@ main(int argc, char **argv) { /* Init xmlsec library */ if(xmlSecInit() < 0) { - fprintf(stderr, "Error: xmlsec initialization failed.\n"); + fprintf(stderr, "Error: xmlsec initialization failed.\n"); return(-1); } /* Init crypto library */ if(xmlSecCryptoAppInit(NULL) < 0) { - fprintf(stderr, "Error: crypto initialization failed.\n"); + fprintf(stderr, "Error: crypto initialization failed.\n"); return(-1); } /* Init xmlsec-crypto library */ if(xmlSecCryptoInit() < 0) { - fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); + fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); return(-1); } @@ -185,40 +185,40 @@ sign_file(const char* tmpl_file, const char* key_file) { /* load template */ doc = xmlParseFile(tmpl_file); if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ - fprintf(stderr, "Error: unable to parse file \"%s\"\n", tmpl_file); + fprintf(stderr, "Error: unable to parse file \"%s\"\n", tmpl_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", tmpl_file); + fprintf(stderr, "Error: start node not found in \"%s\"\n", tmpl_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"); + fprintf(stderr,"Error: failed to create signature context\n"); goto done; } /* load private key, assuming that there is not password */ dsigCtx->signKey = xmlSecCryptoAppKeyLoad(key_file, xmlSecKeyDataFormatPem, NULL, NULL, NULL); if(dsigCtx->signKey == NULL) { - fprintf(stderr,"Error: failed to load private pem key from \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to load private pem key from \"%s\"\n", key_file); 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); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); goto done; } /* sign the template */ if(xmlSecDSigCtxSign(dsigCtx, node) < 0) { - fprintf(stderr,"Error: signature failed\n"); + fprintf(stderr,"Error: signature failed\n"); goto done; } @@ -248,23 +248,23 @@ done: <p></p> <div class="INFORMALEXAMPLE"> <a name="AEN639"></a><p></p> -<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> +<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> <!-- XML Security Library example: Simple signature template file for sign1 example. --> -<Envelope xmlns="urn:envelope"> +<Envelope xmlns="urn:envelope"> <Data> Hello, World! </Data> - <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"> + <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"> <SignedInfo> - <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> - <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /> - <Reference URI=""> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> + <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /> + <Reference URI=""> <Transforms> - <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /> + <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /> </Transforms> - <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /> + <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /> <DigestValue></DigestValue> </Reference> </SignedInfo> @@ -283,23 +283,23 @@ XML Security Library example: Simple signature template file for sign1 example. <p></p> <div class="INFORMALEXAMPLE"> <a name="AEN644"></a><p></p> -<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> +<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> <!-- XML Security Library example: Signed file (sign1 example). --> -<Envelope xmlns="urn:envelope"> +<Envelope xmlns="urn:envelope"> <Data> Hello, World! </Data> - <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"> + <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"> <SignedInfo> - <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> - <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> - <Reference URI=""> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> + <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> + <Reference URI=""> <Transforms> - <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/> + <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/> </Transforms> - <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> + <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> <DigestValue>9H/rQr2Axe9hYTV2n/tCp+3UIQQ=</DigestValue> </Reference> </SignedInfo> diff --git a/docs/api/xmlsec-examples-sign-x509.html b/docs/api/xmlsec-examples-sign-x509.html index 8f5d898b..13ebe442 100644 --- a/docs/api/xmlsec-examples-sign-x509.html +++ b/docs/api/xmlsec-examples-sign-x509.html @@ -116,8 +116,8 @@ main(int argc, char **argv) { assert(argv); if(argc != 4) { - fprintf(stderr, "Error: wrong number of arguments.\n"); - fprintf(stderr, "Usage: %s <xml-file> <key-file> <cert-file>\n", argv[0]); + fprintf(stderr, "Error: wrong number of arguments.\n"); + fprintf(stderr, "Usage: %s <xml-file> <key-file> <cert-file>\n", argv[0]); return(1); } @@ -132,19 +132,19 @@ main(int argc, char **argv) { /* Init xmlsec library */ if(xmlSecInit() < 0) { - fprintf(stderr, "Error: xmlsec initialization failed.\n"); + fprintf(stderr, "Error: xmlsec initialization failed.\n"); return(-1); } /* Init crypto library */ if(xmlSecCryptoAppInit(NULL) < 0) { - fprintf(stderr, "Error: crypto initialization failed.\n"); + fprintf(stderr, "Error: crypto initialization failed.\n"); return(-1); } /* Init xmlsec-crypto library */ if(xmlSecCryptoInit() < 0) { - fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); + fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); return(-1); } @@ -198,7 +198,7 @@ sign_file(const char* xml_file, const char* key_file, const char* cert_file) { /* load doc file */ doc = xmlParseFile(xml_file); if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ - fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); + fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); goto done; } @@ -206,7 +206,7 @@ sign_file(const char* xml_file, const char* key_file, const char* cert_file) { signNode = xmlSecTmplSignatureCreate(doc, xmlSecTransformExclC14NId, xmlSecTransformRsaSha1Id, NULL); if(signNode == NULL) { - fprintf(stderr, "Error: failed to create signature template\n"); + fprintf(stderr, "Error: failed to create signature template\n"); goto done; } @@ -217,57 +217,57 @@ sign_file(const char* xml_file, const char* key_file, const char* cert_file) { refNode = xmlSecTmplSignatureAddReference(signNode, xmlSecTransformSha1Id, NULL, NULL, NULL); if(refNode == NULL) { - fprintf(stderr, "Error: failed to add reference to signature template\n"); + fprintf(stderr, "Error: failed to add reference to signature template\n"); goto done; } /* add enveloped transform */ if(xmlSecTmplReferenceAddTransform(refNode, xmlSecTransformEnvelopedId) == NULL) { - fprintf(stderr, "Error: failed to add enveloped transform to reference\n"); + fprintf(stderr, "Error: failed to add enveloped transform to reference\n"); goto done; } /* add <dsig:KeyInfo/> and <dsig:X509Data/> */ keyInfoNode = xmlSecTmplSignatureEnsureKeyInfo(signNode, NULL); if(keyInfoNode == NULL) { - fprintf(stderr, "Error: failed to add key info\n"); + fprintf(stderr, "Error: failed to add key info\n"); goto done; } if(xmlSecTmplKeyInfoAddX509Data(keyInfoNode) == NULL) { - fprintf(stderr, "Error: failed to add X509Data node\n"); + fprintf(stderr, "Error: failed to add X509Data node\n"); 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"); + fprintf(stderr,"Error: failed to create signature context\n"); goto done; } /* load private key, assuming that there is not password */ dsigCtx->signKey = xmlSecCryptoAppKeyLoad(key_file, xmlSecKeyDataFormatPem, NULL, NULL, NULL); if(dsigCtx->signKey == NULL) { - fprintf(stderr,"Error: failed to load private pem key from \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to load private pem key from \"%s\"\n", key_file); goto done; } /* load certificate and add to the key */ if(xmlSecCryptoAppKeyCertLoad(dsigCtx->signKey, cert_file, xmlSecKeyDataFormatPem) < 0) { - fprintf(stderr,"Error: failed to load pem certificate \"%s\"\n", cert_file); + fprintf(stderr,"Error: failed to load pem certificate \"%s\"\n", cert_file); 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); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); goto done; } /* sign the template */ if(xmlSecDSigCtxSign(dsigCtx, signNode) < 0) { - fprintf(stderr,"Error: signature failed\n"); + fprintf(stderr,"Error: signature failed\n"); goto done; } @@ -297,11 +297,11 @@ done: <p></p> <div class="INFORMALEXAMPLE"> <a name="AEN673"></a><p></p> -<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> +<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> <!-- XML Security Library example: Original XML doc file for sign3 example. --> -<Envelope xmlns="urn:envelope"> +<Envelope xmlns="urn:envelope"> <Data> Hello, World! </Data> @@ -315,23 +315,23 @@ XML Security Library example: Original XML doc file for sign3 example. <p></p> <div class="INFORMALEXAMPLE"> <a name="AEN678"></a><p></p> -<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> +<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> <!-- XML Security Library example: Signed XML doc file (sign3 example). --> -<Envelope xmlns="urn:envelope"> +<Envelope xmlns="urn:envelope"> <Data> Hello, World! </Data> -<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"> +<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"> <SignedInfo> -<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> -<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> +<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> +<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> <Reference> <Transforms> -<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/> +<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/> </Transforms> -<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> +<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> <DigestValue>HjY8ilZAIEM2tBbPn5mYO1ieIX4=</DigestValue> </Reference> </SignedInfo> diff --git a/docs/api/xmlsec-index.html b/docs/api/xmlsec-index.html index 7507ece7..a95f3023 100644 --- a/docs/api/xmlsec-index.html +++ b/docs/api/xmlsec-index.html @@ -417,6 +417,8 @@ <li><p><a href="xmlsec-keys.html#XMLSECKEYPTRLISTGETKLASS">xmlSecKeyPtrListGetKlass</a></p></li> <li><p><a href="xmlsec-keys.html#XMLSECKEYPTRLISTID">xmlSecKeyPtrListId</a></p></li> <li><p><a href="xmlsec-keys.html#XMLSECKEYREADBINARYFILE">xmlSecKeyReadBinaryFile</a></p></li> +<li><p><font>xmlSecKeyReadBuffer</font></p></li> +<li><p><font>xmlSecKeyReadMemory</font></p></li> <li><p><a href="xmlsec-keys.html#XMLSECKEYREQCOPY">xmlSecKeyReqCopy</a></p></li> <li><p><a href="xmlsec-keys.html#XMLSECKEYREQFINALIZE">xmlSecKeyReqFinalize</a></p></li> <li><p><a href="xmlsec-keys.html#XMLSECKEYREQINITIALIZE">xmlSecKeyReqInitialize</a></p></li> @@ -561,10 +563,18 @@ <li><p><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRLOAD">xmlSecOpenSSLAppDefaultKeysMngrLoad</a></p></li> <li><p><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRSAVE">xmlSecOpenSSLAppDefaultKeysMngrSave</a></p></li> <li><p><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPINIT">xmlSecOpenSSLAppInit</a></p></li> +<li><p><font>xmlSecOpenSSLAppKeyCertLoadBIO</font></p></li> +<li><p><font>xmlSecOpenSSLAppKeyCertLoadMemory</font></p></li> <li><p><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYCERTLOAD">xmlSecOpenSSLAppKeyCertLoad</a></p></li> +<li><p><font>xmlSecOpenSSLAppKeyLoadBIO</font></p></li> +<li><p><font>xmlSecOpenSSLAppKeyLoadMemory</font></p></li> <li><p><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYLOAD">xmlSecOpenSSLAppKeyLoad</a></p></li> <li><p><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRADDCERTSPATH">xmlSecOpenSSLAppKeysMngrAddCertsPath</a></p></li> +<li><p><font>xmlSecOpenSSLAppKeysMngrCertLoadBIO</font></p></li> +<li><p><font>xmlSecOpenSSLAppKeysMngrCertLoadMemory</font></p></li> <li><p><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRCERTLOAD">xmlSecOpenSSLAppKeysMngrCertLoad</a></p></li> +<li><p><font>xmlSecOpenSSLAppPkcs12LoadBIO</font></p></li> +<li><p><font>xmlSecOpenSSLAppPkcs12LoadMemory</font></p></li> <li><p><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOAD">xmlSecOpenSSLAppPkcs12Load</a></p></li> <li><p><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPSHUTDOWN">xmlSecOpenSSLAppShutdown</a></p></li> <li><p><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLERRORSDEFAULTCALLBACK">xmlSecOpenSSLErrorsDefaultCallback</a></p></li> @@ -868,6 +878,13 @@ <li><p><a href="xmlsec-version.html#XMLSEC-VERSION-MINOR-CAPS">XMLSEC-VERSION-MINOR</a></p></li> <li><p><a href="xmlsec-version.html#XMLSEC-VERSION-CAPS">XMLSEC-VERSION</a></p></li> <li><p><a href="xmlsec-version.html#XMLSEC-VERSION-SUBMINOR-CAPS">XMLSEC-VERSION-SUBMINOR</a></p></li> +<li><p><font>XMLSEC-X509DATA-CERTIFICATE-NODE</font></p></li> +<li><p><font>XMLSEC-X509DATA-CRL-NODE</font></p></li> +<li><p><font>XMLSEC-X509DATA-DEFAULT</font></p></li> +<li><p><font>xmlSecX509DataGetNodeContent</font></p></li> +<li><p><font>XMLSEC-X509DATA-ISSUERSERIAL-NODE</font></p></li> +<li><p><font>XMLSEC-X509DATA-SKI-NODE</font></p></li> +<li><p><font>XMLSEC-X509DATA-SUBJECTNAME-NODE</font></p></li> <li><p><font>xmlSecXkissServerCtxCopyUserPref</font></p></li> <li><p><font>xmlSecXkissServerCtxCreate</font></p></li> <li><p><font>xmlSecXkissServerCtxDebugDump</font></p></li> diff --git a/docs/api/xmlsec-index.sgml b/docs/api/xmlsec-index.sgml index c9a21518..3e1f9842 100644 --- a/docs/api/xmlsec-index.sgml +++ b/docs/api/xmlsec-index.sgml @@ -353,6 +353,8 @@ <listitem><para><link linkend="xmlSecKeyPtrListGetKlass">xmlSecKeyPtrListGetKlass</link></para></listitem> <listitem><para><link linkend="xmlSecKeyPtrListId">xmlSecKeyPtrListId</link></para></listitem> <listitem><para><link linkend="xmlSecKeyReadBinaryFile">xmlSecKeyReadBinaryFile</link></para></listitem> +<listitem><para><link linkend="xmlSecKeyReadBuffer">xmlSecKeyReadBuffer</link></para></listitem> +<listitem><para><link linkend="xmlSecKeyReadMemory">xmlSecKeyReadMemory</link></para></listitem> <listitem><para><link linkend="xmlSecKeyReqCopy">xmlSecKeyReqCopy</link></para></listitem> <listitem><para><link linkend="xmlSecKeyReqFinalize">xmlSecKeyReqFinalize</link></para></listitem> <listitem><para><link linkend="xmlSecKeyReqInitialize">xmlSecKeyReqInitialize</link></para></listitem> @@ -497,10 +499,18 @@ <listitem><para><link linkend="xmlSecOpenSSLAppDefaultKeysMngrLoad">xmlSecOpenSSLAppDefaultKeysMngrLoad</link></para></listitem> <listitem><para><link linkend="xmlSecOpenSSLAppDefaultKeysMngrSave">xmlSecOpenSSLAppDefaultKeysMngrSave</link></para></listitem> <listitem><para><link linkend="xmlSecOpenSSLAppInit">xmlSecOpenSSLAppInit</link></para></listitem> +<listitem><para><link linkend="xmlSecOpenSSLAppKeyCertLoadBIO">xmlSecOpenSSLAppKeyCertLoadBIO</link></para></listitem> +<listitem><para><link linkend="xmlSecOpenSSLAppKeyCertLoadMemory">xmlSecOpenSSLAppKeyCertLoadMemory</link></para></listitem> <listitem><para><link linkend="xmlSecOpenSSLAppKeyCertLoad">xmlSecOpenSSLAppKeyCertLoad</link></para></listitem> +<listitem><para><link linkend="xmlSecOpenSSLAppKeyLoadBIO">xmlSecOpenSSLAppKeyLoadBIO</link></para></listitem> +<listitem><para><link linkend="xmlSecOpenSSLAppKeyLoadMemory">xmlSecOpenSSLAppKeyLoadMemory</link></para></listitem> <listitem><para><link linkend="xmlSecOpenSSLAppKeyLoad">xmlSecOpenSSLAppKeyLoad</link></para></listitem> <listitem><para><link linkend="xmlSecOpenSSLAppKeysMngrAddCertsPath">xmlSecOpenSSLAppKeysMngrAddCertsPath</link></para></listitem> +<listitem><para><link linkend="xmlSecOpenSSLAppKeysMngrCertLoadBIO">xmlSecOpenSSLAppKeysMngrCertLoadBIO</link></para></listitem> +<listitem><para><link linkend="xmlSecOpenSSLAppKeysMngrCertLoadMemory">xmlSecOpenSSLAppKeysMngrCertLoadMemory</link></para></listitem> <listitem><para><link linkend="xmlSecOpenSSLAppKeysMngrCertLoad">xmlSecOpenSSLAppKeysMngrCertLoad</link></para></listitem> +<listitem><para><link linkend="xmlSecOpenSSLAppPkcs12LoadBIO">xmlSecOpenSSLAppPkcs12LoadBIO</link></para></listitem> +<listitem><para><link linkend="xmlSecOpenSSLAppPkcs12LoadMemory">xmlSecOpenSSLAppPkcs12LoadMemory</link></para></listitem> <listitem><para><link linkend="xmlSecOpenSSLAppPkcs12Load">xmlSecOpenSSLAppPkcs12Load</link></para></listitem> <listitem><para><link linkend="xmlSecOpenSSLAppShutdown">xmlSecOpenSSLAppShutdown</link></para></listitem> <listitem><para><link linkend="xmlSecOpenSSLErrorsDefaultCallback">xmlSecOpenSSLErrorsDefaultCallback</link></para></listitem> @@ -804,6 +814,13 @@ <listitem><para><link linkend="XMLSEC-VERSION-MINOR-CAPS">XMLSEC-VERSION-MINOR</link></para></listitem> <listitem><para><link linkend="XMLSEC-VERSION-CAPS">XMLSEC-VERSION</link></para></listitem> <listitem><para><link linkend="XMLSEC-VERSION-SUBMINOR-CAPS">XMLSEC-VERSION-SUBMINOR</link></para></listitem> +<listitem><para><link linkend="XMLSEC-X509DATA-CERTIFICATE-NODE-CAPS">XMLSEC-X509DATA-CERTIFICATE-NODE</link></para></listitem> +<listitem><para><link linkend="XMLSEC-X509DATA-CRL-NODE-CAPS">XMLSEC-X509DATA-CRL-NODE</link></para></listitem> +<listitem><para><link linkend="XMLSEC-X509DATA-DEFAULT-CAPS">XMLSEC-X509DATA-DEFAULT</link></para></listitem> +<listitem><para><link linkend="xmlSecX509DataGetNodeContent">xmlSecX509DataGetNodeContent</link></para></listitem> +<listitem><para><link linkend="XMLSEC-X509DATA-ISSUERSERIAL-NODE-CAPS">XMLSEC-X509DATA-ISSUERSERIAL-NODE</link></para></listitem> +<listitem><para><link linkend="XMLSEC-X509DATA-SKI-NODE-CAPS">XMLSEC-X509DATA-SKI-NODE</link></para></listitem> +<listitem><para><link linkend="XMLSEC-X509DATA-SUBJECTNAME-NODE-CAPS">XMLSEC-X509DATA-SUBJECTNAME-NODE</link></para></listitem> <listitem><para><link linkend="xmlSecXkissServerCtxCopyUserPref">xmlSecXkissServerCtxCopyUserPref</link></para></listitem> <listitem><para><link linkend="xmlSecXkissServerCtxCreate">xmlSecXkissServerCtxCreate</link></para></listitem> <listitem><para><link linkend="xmlSecXkissServerCtxDebugDump">xmlSecXkissServerCtxDebugDump</link></para></listitem> diff --git a/docs/api/xmlsec-keyinfo.html b/docs/api/xmlsec-keyinfo.html index f8b08097..5e2aa609 100644 --- a/docs/api/xmlsec-keyinfo.html +++ b/docs/api/xmlsec-keyinfo.html @@ -413,10 +413,10 @@ Otherwise we just ignore it.</p> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN2762"><span style="white-space: nowrap"><font>time_t</font> <tt class="STRUCTFIELD"><i>certsVerificationTime</i></tt></span></a></td> <td align="LEFT" valign="TOP" width="80%"><p> the time to use for X509 certificates verification - ("not valid before" and "not valid after" checks); + ("not valid before" and "not valid after" checks); if <tt class="PARAMETER"><i>certsVerificationTime</i></tt> is equal to 0 (default) then we verify certificates against the system's - clock "now".</p></td> + clock "now".</p></td> </tr> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN2769"><span style="white-space: nowrap">int <tt class="STRUCTFIELD"><i>certsVerificationDepth</i></tt></span></a></td> diff --git a/docs/api/xmlsec-keysdata.html b/docs/api/xmlsec-keysdata.html index d0d5f8d0..4bf57364 100644 --- a/docs/api/xmlsec-keysdata.html +++ b/docs/api/xmlsec-keysdata.html @@ -993,7 +993,7 @@ or 0 otherwise.</p> <a name="AEN4045"></a><h3> <a name="XMLSECKEYDATAIDUNKNOWN"></a>xmlSecKeyDataIdUnknown</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define xmlSecKeyDataIdUnknown NULL</pre></td></tr></table> -<p>The "unknown" id.</p> +<p>The "unknown" id.</p> <p></p> </div> <hr> @@ -2122,7 +2122,7 @@ or 0 otherwise.</p> <a name="AEN5204"></a><h3> <a name="XMLSECKEYDATASTOREIDUNKNOWN"></a>xmlSecKeyDataStoreIdUnknown</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define xmlSecKeyDataStoreIdUnknown NULL</pre></td></tr></table> -<p>The "unknown" id.</p> +<p>The "unknown" id.</p> <p></p> </div> <hr> diff --git a/docs/api/xmlsec-keysmngr.html b/docs/api/xmlsec-keysmngr.html index 3b96dc0b..00472665 100644 --- a/docs/api/xmlsec-keysmngr.html +++ b/docs/api/xmlsec-keysmngr.html @@ -512,7 +512,7 @@ or 0 otherwise.</p> <a name="AEN6643"></a><h3> <a name="XMLSECKEYSTOREIDUNKNOWN"></a>xmlSecKeyStoreIdUnknown</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define xmlSecKeyStoreIdUnknown NULL</pre></td></tr></table> -<p>The "unknown" id.</p> +<p>The "unknown" id.</p> <p></p> </div> <hr> diff --git a/docs/api/xmlsec-list.html b/docs/api/xmlsec-list.html index 15089d8c..7c4c283a 100644 --- a/docs/api/xmlsec-list.html +++ b/docs/api/xmlsec-list.html @@ -512,7 +512,7 @@ or 0 otherwise.</p> <a name="AEN7368"></a><h3> <a name="XMLSECPTRLISTIDUNKNOWN"></a>xmlSecPtrListIdUnknown</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define xmlSecPtrListIdUnknown NULL</pre></td></tr></table> -<p>The "unknown" id.</p> +<p>The "unknown" id.</p> <p></p> </div> <hr> diff --git a/docs/api/xmlsec-nodeset.html b/docs/api/xmlsec-nodeset.html index 1c618806..b862238b 100644 --- a/docs/api/xmlsec-nodeset.html +++ b/docs/api/xmlsec-nodeset.html @@ -451,7 +451,7 @@ occurs.</p></td> </tr> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN7974"><span style="white-space: nowrap"><tt class="PARAMETER"><i>invert</i></tt> :</span></a></td> -<td align="LEFT" valign="TOP" width="80%"><p> the "invert" flag.</p></td> +<td align="LEFT" valign="TOP" width="80%"><p> the "invert" flag.</p></td> </tr> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN7979"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td> diff --git a/docs/api/xmlsec-notes-compiling-unix.html b/docs/api/xmlsec-notes-compiling-unix.html index f3af0305..99933f24 100644 --- a/docs/api/xmlsec-notes-compiling-unix.html +++ b/docs/api/xmlsec-notes-compiling-unix.html @@ -74,9 +74,9 @@ dnl Check for xmlsec and friends dnl PKG_CHECK_MODULES(XMLSEC, xmlsec1 >= 1.0.0 xml2 libxslt,,exit) -CFLAGS="$CFLAGS $XMLSEC_CFLAGS" -CPPFLAGS="$CPPFLAGS $XMLSEC_CFLAGS" -LDFLAGS="$LDFLAGS $XMLSEC_LIBS" +CFLAGS="$CFLAGS $XMLSEC_CFLAGS" +CPPFLAGS="$CPPFLAGS $XMLSEC_CFLAGS" +LDFLAGS="$LDFLAGS $XMLSEC_LIBS" </pre></td></tr></table> </div> </li> diff --git a/docs/api/xmlsec-notes-contexts.html b/docs/api/xmlsec-notes-contexts.html index f87bd4c7..9e28626c 100644 --- a/docs/api/xmlsec-notes-contexts.html +++ b/docs/api/xmlsec-notes-contexts.html @@ -71,7 +71,7 @@ For example, signature in a simple SAML Response should have only one <dsig:Reference/> element with an empty or NULL URI attribute and only one enveloped transform. - XML Security Library uses "context" objects to let application + XML Security Library uses "context" objects to let application enable or disable particular features, return the result data and the information collected during the processing. Also all the context objects defined in XML Security library have @@ -109,21 +109,21 @@ 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); + 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); + 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"); + fprintf(stderr,"Error: failed to create signature context\n"); goto done; } @@ -136,7 +136,7 @@ verify_file(xmlSecKeysMngrPtr mngr, const char* xml_file) { (xmlSecDSigCtxEnableSignatureTransform(dsigCtx, xmlSecTransformSha1Id) < 0) || (xmlSecDSigCtxEnableSignatureTransform(dsigCtx, xmlSecTransformRsaSha1Id) < 0)) { - fprintf(stderr,"Error: failed to limit allowed siganture transforms\n"); + fprintf(stderr,"Error: failed to limit allowed siganture transforms\n"); goto done; } if((xmlSecDSigCtxEnableReferenceTransform(dsigCtx, xmlSecTransformInclC14NId) < 0) || @@ -144,19 +144,19 @@ verify_file(xmlSecKeysMngrPtr mngr, const char* xml_file) { (xmlSecDSigCtxEnableReferenceTransform(dsigCtx, xmlSecTransformSha1Id) < 0) || (xmlSecDSigCtxEnableReferenceTransform(dsigCtx, xmlSecTransformEnvelopedId) < 0)) { - fprintf(stderr,"Error: failed to limit allowed reference transforms\n"); + fprintf(stderr,"Error: failed to limit allowed reference transforms\n"); goto done; } /* in addition, limit possible key data to valid X509 certificates only */ if(xmlSecPtrListAdd(&(dsigCtx->keyInfoReadCtx.enabledKeyData), BAD_CAST xmlSecKeyDataX509Id) < 0) { - fprintf(stderr,"Error: failed to limit allowed key data\n"); + fprintf(stderr,"Error: failed to limit allowed key data\n"); goto done; } /* Verify signature */ if(xmlSecDSigCtxVerify(dsigCtx, node) < 0) { - fprintf(stderr,"Error: signature verify\n"); + fprintf(stderr,"Error: signature verify\n"); goto done; } @@ -164,15 +164,15 @@ verify_file(xmlSecKeysMngrPtr mngr, const char* xml_file) { if((dsigCtx->status == xmlSecDSigStatusSucceeded) && (xmlSecPtrListGetSize(&(dsigCtx->signedInfoReferences)) != 1)) { - fprintf(stderr,"Error: only one reference is allowed\n"); + fprintf(stderr,"Error: only one reference is allowed\n"); 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 */ diff --git a/docs/api/xmlsec-notes-custom-keys-store.html b/docs/api/xmlsec-notes-custom-keys-store.html index abdb9a72..2fa4b2c9 100644 --- a/docs/api/xmlsec-notes-custom-keys-store.html +++ b/docs/api/xmlsec-notes-custom-keys-store.html @@ -84,21 +84,21 @@ create_files_keys_mngr(void) { /* create files based keys store */ keysStore = xmlSecKeyStoreCreate(files_keys_store_get_klass()); if(keysStore == NULL) { - fprintf(stderr, "Error: failed to create keys store.\n"); + fprintf(stderr, "Error: failed to create keys store.\n"); return(NULL); } /* create keys manager */ mngr = xmlSecKeysMngrCreate(); if(mngr == NULL) { - fprintf(stderr, "Error: failed to create keys manager.\n"); + fprintf(stderr, "Error: failed to create keys manager.\n"); xmlSecKeyStoreDestroy(keysStore); return(NULL); } /* add store to keys manager, from now on keys manager destroys the store if needed */ if(xmlSecKeysMngrAdoptKeysStore(mngr, keysStore) < 0) { - fprintf(stderr, "Error: failed to add keys store to keys manager.\n"); + fprintf(stderr, "Error: failed to add keys store to keys manager.\n"); xmlSecKeyStoreDestroy(keysStore); xmlSecKeysMngrDestroy(mngr); return(NULL); @@ -106,7 +106,7 @@ create_files_keys_mngr(void) { /* initialize crypto library specific data in keys manager */ if(xmlSecCryptoKeysMngrInit(mngr) < 0) { - fprintf(stderr, "Error: failed to initialize crypto data in keys manager.\n"); + fprintf(stderr, "Error: failed to initialize crypto data in keys manager.\n"); xmlSecKeysMngrDestroy(mngr); return(NULL); } @@ -129,7 +129,7 @@ static xmlSecKeyPtr files_keys_store_find_key (xmlSecKeyStorePtr store, static xmlSecKeyStoreKlass files_keys_store_klass = { sizeof(xmlSecKeyStoreKlass), sizeof(xmlSecKeyStore), - BAD_CAST "files-based-keys-store", /* const xmlChar* name; */ + BAD_CAST "files-based-keys-store", /* const xmlChar* name; */ NULL, /* xmlSecKeyStoreInitializeMethod initialize; */ NULL, /* xmlSecKeyStoreFinalizeMethod finalize; */ files_keys_store_find_key, /* xmlSecKeyStoreFindKeyMethod findKey; */ @@ -176,7 +176,7 @@ files_keys_store_find_key(xmlSecKeyStorePtr store, const xmlChar* name, xmlSecKe return(NULL); } - /* we don't want to open files in a folder other than "current"; + /* we don't want to open files in a folder other than "current"; * to prevent it limit the characters in the key name to alpha/digit, * '.', '-' or '_'. */ @@ -190,21 +190,21 @@ files_keys_store_find_key(xmlSecKeyStorePtr store, const xmlChar* name, xmlSecKe /* load key from a pem file, if key is not found then it's an error (is it?) */ key = xmlSecCryptoAppKeyLoad(name, xmlSecKeyDataFormatPem, NULL, NULL, NULL); if(key == NULL) { - fprintf(stderr,"Error: failed to load pem key from \"%s\"\n", name); + fprintf(stderr,"Error: failed to load pem key from \"%s\"\n", name); return(NULL); } } else { /* otherwise it's a binary key, if key is not found then it's an error (is it?) */ key = xmlSecKeyReadBinaryFile(keyInfoCtx->keyReq.keyId, name); if(key == NULL) { - fprintf(stderr,"Error: failed to load key from binary file \"%s\"\n", name); + fprintf(stderr,"Error: failed to load key from binary file \"%s\"\n", name); return(NULL); } } /* set key name */ if(xmlSecKeySetName(key, name) < 0) { - fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", name); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", name); xmlSecKeyDestroy(key); return(NULL); } diff --git a/docs/api/xmlsec-notes-decrypt.html b/docs/api/xmlsec-notes-decrypt.html index c7d1054d..da07826a 100644 --- a/docs/api/xmlsec-notes-decrypt.html +++ b/docs/api/xmlsec-notes-decrypt.html @@ -100,49 +100,49 @@ decrypt_file(const char* enc_file, const char* key_file) { /* load template */ doc = xmlParseFile(enc_file); if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ - fprintf(stderr, "Error: unable to parse file \"%s\"\n", enc_file); + fprintf(stderr, "Error: unable to parse file \"%s\"\n", enc_file); goto done; } /* find start node */ node = xmlSecFindNode(xmlDocGetRootElement(doc), xmlSecNodeEncryptedData, xmlSecEncNs); if(node == NULL) { - fprintf(stderr, "Error: start node not found in \"%s\"\n", enc_file); + fprintf(stderr, "Error: start node not found in \"%s\"\n", enc_file); goto done; } /* create encryption context, we don't need keys manager in this example */ encCtx = xmlSecEncCtxCreate(NULL); if(encCtx == NULL) { - fprintf(stderr,"Error: failed to create encryption context\n"); + fprintf(stderr,"Error: failed to create encryption context\n"); goto done; } /* load DES key */ encCtx->encKey = xmlSecKeyReadBinaryFile(xmlSecKeyDataDesId, key_file); if(encCtx->encKey == NULL) { - fprintf(stderr,"Error: failed to load des key from binary file \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to load des key from binary file \"%s\"\n", key_file); goto done; } /* set key name to the file name, this is just an example! */ if(xmlSecKeySetName(encCtx->encKey, key_file) < 0) { - fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); goto done; } /* decrypt the data */ if((xmlSecEncCtxDecrypt(encCtx, node) < 0) || (encCtx->result == NULL)) { - fprintf(stderr,"Error: decryption failed\n"); + fprintf(stderr,"Error: decryption failed\n"); goto done; } /* print decrypted data to stdout */ if(encCtx->resultReplaced != 0) { - fprintf(stdout, "Decrypted XML data:\n"); + fprintf(stdout, "Decrypted XML data:\n"); xmlDocDump(stdout, doc); } else { - fprintf(stdout, "Decrypted binary data (%d bytes):\n", xmlSecBufferGetSize(encCtx->result)); + fprintf(stdout, "Decrypted binary data (%d bytes):\n", xmlSecBufferGetSize(encCtx->result)); if(xmlSecBufferGetData(encCtx->result) != NULL) { fwrite(xmlSecBufferGetData(encCtx->result), 1, @@ -150,7 +150,7 @@ decrypt_file(const char* enc_file, const char* key_file) { stdout); } } - fprintf(stdout, "\n"); + fprintf(stdout, "\n"); /* success */ res = 0; diff --git a/docs/api/xmlsec-notes-dynamic-encryption-templates.html b/docs/api/xmlsec-notes-dynamic-encryption-templates.html index c7d007cf..667ff920 100644 --- a/docs/api/xmlsec-notes-dynamic-encryption-templates.html +++ b/docs/api/xmlsec-notes-dynamic-encryption-templates.html @@ -119,7 +119,7 @@ encrypt_file(const char* xml_file, const char* key_file) { /* load template */ doc = xmlParseFile(xml_file); if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ - fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); + fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); goto done; } @@ -128,51 +128,51 @@ encrypt_file(const char* xml_file, const char* key_file) { encDataNode = xmlSecTmplEncDataCreate(doc, xmlSecTransformDes3CbcId, NULL, xmlSecTypeEncElement, NULL, NULL); if(encDataNode == NULL) { - fprintf(stderr, "Error: failed to create encryption template\n"); + fprintf(stderr, "Error: failed to create encryption template\n"); goto done; } /* we want to put encrypted data in the <enc:CipherValue/> node */ if(xmlSecTmplEncDataEnsureCipherValue(encDataNode) == NULL) { - fprintf(stderr, "Error: failed to add CipherValue node\n"); + fprintf(stderr, "Error: failed to add CipherValue node\n"); goto done; } /* add <dsig:KeyInfo/> and <dsig:KeyName/> nodes to put key name in the signed document */ keyInfoNode = xmlSecTmplEncDataEnsureKeyInfo(encDataNode, NULL); if(keyInfoNode == NULL) { - fprintf(stderr, "Error: failed to add key info\n"); + fprintf(stderr, "Error: failed to add key info\n"); goto done; } if(xmlSecTmplKeyInfoAddKeyName(keyInfoNode, NULL) == NULL) { - fprintf(stderr, "Error: failed to add key name\n"); + fprintf(stderr, "Error: failed to add key name\n"); goto done; } /* create encryption context, we don't need keys manager in this example */ encCtx = xmlSecEncCtxCreate(NULL); if(encCtx == NULL) { - fprintf(stderr,"Error: failed to create encryption context\n"); + fprintf(stderr,"Error: failed to create encryption context\n"); goto done; } /* load DES key, assuming that there is not password */ encCtx->encKey = xmlSecKeyReadBinaryFile(xmlSecKeyDataDesId, key_file); if(encCtx->encKey == NULL) { - fprintf(stderr,"Error: failed to load des key from binary file \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to load des key from binary file \"%s\"\n", key_file); goto done; } /* set key name to the file name, this is just an example! */ if(xmlSecKeySetName(encCtx->encKey, key_file) < 0) { - fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); goto done; } /* encrypt the data */ if(xmlSecEncCtxXmlEncrypt(encCtx, encDataNode, xmlDocGetRootElement(doc)) < 0) { - fprintf(stderr,"Error: encryption failed\n"); + fprintf(stderr,"Error: encryption failed\n"); goto done; } diff --git a/docs/api/xmlsec-notes-dynamic-signature-templates.html b/docs/api/xmlsec-notes-dynamic-signature-templates.html index 690a8345..e1d75514 100644 --- a/docs/api/xmlsec-notes-dynamic-signature-templates.html +++ b/docs/api/xmlsec-notes-dynamic-signature-templates.html @@ -127,7 +127,7 @@ sign_file(const char* xml_file, const char* key_file) { /* load doc file */ doc = xmlParseFile(xml_file); if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ - fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); + fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); goto done; } @@ -135,7 +135,7 @@ sign_file(const char* xml_file, const char* key_file) { signNode = xmlSecTmplSignatureCreate(doc, xmlSecTransformExclC14NId, xmlSecTransformRsaSha1Id, NULL); if(signNode == NULL) { - fprintf(stderr, "Error: failed to create signature template\n"); + fprintf(stderr, "Error: failed to create signature template\n"); goto done; } @@ -146,51 +146,51 @@ sign_file(const char* xml_file, const char* key_file) { refNode = xmlSecTmplSignatureAddReference(signNode, xmlSecTransformSha1Id, NULL, NULL, NULL); if(refNode == NULL) { - fprintf(stderr, "Error: failed to add reference to signature template\n"); + fprintf(stderr, "Error: failed to add reference to signature template\n"); goto done; } /* add enveloped transform */ if(xmlSecTmplReferenceAddTransform(refNode, xmlSecTransformEnvelopedId) == NULL) { - fprintf(stderr, "Error: failed to add enveloped transform to reference\n"); + fprintf(stderr, "Error: failed to add enveloped transform to reference\n"); goto done; } /* add <dsig:KeyInfo/> and <dsig:KeyName/> nodes to put key name in the signed document */ keyInfoNode = xmlSecTmplSignatureEnsureKeyInfo(signNode, NULL); if(keyInfoNode == NULL) { - fprintf(stderr, "Error: failed to add key info\n"); + fprintf(stderr, "Error: failed to add key info\n"); goto done; } if(xmlSecTmplKeyInfoAddKeyName(keyInfoNode, NULL) == NULL) { - fprintf(stderr, "Error: failed to add key name\n"); + fprintf(stderr, "Error: failed to add key name\n"); 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"); + fprintf(stderr,"Error: failed to create signature context\n"); goto done; } /* load private key, assuming that there is not password */ dsigCtx->signKey = xmlSecCryptoAppKeyLoad(key_file, xmlSecKeyDataFormatPem, NULL, NULL, NULL); if(dsigCtx->signKey == NULL) { - fprintf(stderr,"Error: failed to load private pem key from \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to load private pem key from \"%s\"\n", key_file); 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); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); goto done; } /* sign the template */ if(xmlSecDSigCtxSign(dsigCtx, signNode) < 0) { - fprintf(stderr,"Error: signature failed\n"); + fprintf(stderr,"Error: signature failed\n"); goto done; } diff --git a/docs/api/xmlsec-notes-encrypt.html b/docs/api/xmlsec-notes-encrypt.html index 92124525..aea53212 100644 --- a/docs/api/xmlsec-notes-encrypt.html +++ b/docs/api/xmlsec-notes-encrypt.html @@ -129,40 +129,40 @@ encrypt_file(const char* tmpl_file, const char* key_file, const unsigned char* d /* load template */ doc = xmlParseFile(tmpl_file); if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ - fprintf(stderr, "Error: unable to parse file \"%s\"\n", tmpl_file); + fprintf(stderr, "Error: unable to parse file \"%s\"\n", tmpl_file); goto done; } /* find start node */ node = xmlSecFindNode(xmlDocGetRootElement(doc), xmlSecNodeEncryptedData, xmlSecEncNs); if(node == NULL) { - fprintf(stderr, "Error: start node not found in \"%s\"\n", tmpl_file); + fprintf(stderr, "Error: start node not found in \"%s\"\n", tmpl_file); goto done; } /* create encryption context, we don't need keys manager in this example */ encCtx = xmlSecEncCtxCreate(NULL); if(encCtx == NULL) { - fprintf(stderr,"Error: failed to create encryption context\n"); + fprintf(stderr,"Error: failed to create encryption context\n"); goto done; } /* load DES key */ encCtx->encKey = xmlSecKeyReadBinaryFile(xmlSecKeyDataDesId, key_file); if(encCtx->encKey == NULL) { - fprintf(stderr,"Error: failed to load des key from binary file \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to load des key from binary file \"%s\"\n", key_file); goto done; } /* set key name to the file name, this is just an example! */ if(xmlSecKeySetName(encCtx->encKey, key_file) < 0) { - fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); goto done; } /* encrypt the data */ if(xmlSecEncCtxBinaryEncrypt(encCtx, node, data, dataSize) < 0) { - fprintf(stderr,"Error: encryption failed\n"); + fprintf(stderr,"Error: encryption failed\n"); goto done; } diff --git a/docs/api/xmlsec-notes-init-shutdown.html b/docs/api/xmlsec-notes-init-shutdown.html index 337e9e4f..20975d7e 100644 --- a/docs/api/xmlsec-notes-init-shutdown.html +++ b/docs/api/xmlsec-notes-init-shutdown.html @@ -99,19 +99,19 @@ /* Init xmlsec library */ if(xmlSecInit() < 0) { - fprintf(stderr, "Error: xmlsec initialization failed.\n"); + fprintf(stderr, "Error: xmlsec initialization failed.\n"); return(-1); } /* Init crypto library */ if(xmlSecCryptoAppInit(NULL) < 0) { - fprintf(stderr, "Error: crypto initialization failed.\n"); + fprintf(stderr, "Error: crypto initialization failed.\n"); return(-1); } /* Init xmlsec-crypto library */ if(xmlSecCryptoInit() < 0) { - fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); + fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); return(-1); } </pre></td></tr></table> diff --git a/docs/api/xmlsec-notes-keys-manager-sign-enc.html b/docs/api/xmlsec-notes-keys-manager-sign-enc.html index 1af9a45a..e158378f 100644 --- a/docs/api/xmlsec-notes-keys-manager-sign-enc.html +++ b/docs/api/xmlsec-notes-keys-manager-sign-enc.html @@ -102,11 +102,11 @@ load_rsa_keys(char* key_file) { */ mngr = xmlSecKeysMngrCreate(); if(mngr == NULL) { - fprintf(stderr, "Error: failed to create keys manager.\n"); + fprintf(stderr, "Error: failed to create keys manager.\n"); return(NULL); } if(xmlSecCryptoAppDefaultKeysMngrInit(mngr) < 0) { - fprintf(stderr, "Error: failed to initialize keys manager.\n"); + fprintf(stderr, "Error: failed to initialize keys manager.\n"); xmlSecKeysMngrDestroy(mngr); return(NULL); } @@ -114,14 +114,14 @@ load_rsa_keys(char* key_file) { /* load private RSA key */ key = xmlSecCryptoAppKeyLoad(key_file, xmlSecKeyDataFormatPem, NULL, NULL, NULL); if(key == NULL) { - fprintf(stderr,"Error: failed to load rsa key from file \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to load rsa key from file \"%s\"\n", key_file); xmlSecKeysMngrDestroy(mngr); return(NULL); } /* set key name to the file name, this is just an example! */ if(xmlSecKeySetName(key, BAD_CAST key_file) < 0) { - fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); xmlSecKeyDestroy(key); xmlSecKeysMngrDestroy(mngr); return(NULL); @@ -131,7 +131,7 @@ load_rsa_keys(char* key_file) { * for destroying key */ if(xmlSecCryptoAppDefaultKeysMngrAdoptKey(mngr, key) < 0) { - fprintf(stderr,"Error: failed to add key from \"%s\" to keys manager\n", key_file); + fprintf(stderr,"Error: failed to add key from \"%s\" to keys manager\n", key_file); xmlSecKeyDestroy(key); xmlSecKeysMngrDestroy(mngr); return(NULL); @@ -168,7 +168,7 @@ encrypt_file(xmlSecKeysMngrPtr mngr, const char* xml_file, const char* key_name) /* load template */ doc = xmlParseFile(xml_file); if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ - fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); + fprintf(stderr, "Error: unable to parse file \"%s\"\n", xml_file); goto done; } @@ -177,20 +177,20 @@ encrypt_file(xmlSecKeysMngrPtr mngr, const char* xml_file, const char* key_name) encDataNode = xmlSecTmplEncDataCreate(doc, xmlSecTransformDes3CbcId, NULL, xmlSecTypeEncElement, NULL, NULL); if(encDataNode == NULL) { - fprintf(stderr, "Error: failed to create encryption template\n"); + fprintf(stderr, "Error: failed to create encryption template\n"); goto done; } /* we want to put encrypted data in the <enc:CipherValue/> node */ if(xmlSecTmplEncDataEnsureCipherValue(encDataNode) == NULL) { - fprintf(stderr, "Error: failed to add CipherValue node\n"); + fprintf(stderr, "Error: failed to add CipherValue node\n"); goto done; } /* add <dsig:KeyInfo/> */ keyInfoNode = xmlSecTmplEncDataEnsureKeyInfo(encDataNode, NULL); if(keyInfoNode == NULL) { - fprintf(stderr, "Error: failed to add key info\n"); + fprintf(stderr, "Error: failed to add key info\n"); goto done; } @@ -199,46 +199,46 @@ encrypt_file(xmlSecKeysMngrPtr mngr, const char* xml_file, const char* key_name) xmlSecTransformRsaOaepId, NULL, NULL, NULL); if(encKeyNode == NULL) { - fprintf(stderr, "Error: failed to add key info\n"); + fprintf(stderr, "Error: failed to add key info\n"); goto done; } /* we want to put encrypted key in the <enc:CipherValue/> node */ if(xmlSecTmplEncDataEnsureCipherValue(encKeyNode) == NULL) { - fprintf(stderr, "Error: failed to add CipherValue node\n"); + fprintf(stderr, "Error: failed to add CipherValue node\n"); goto done; } /* add <dsig:KeyInfo/> and <dsig:KeyName/> nodes to <enc:EncryptedKey/> */ keyInfoNode2 = xmlSecTmplEncDataEnsureKeyInfo(encKeyNode, NULL); if(keyInfoNode2 == NULL) { - fprintf(stderr, "Error: failed to add key info\n"); + fprintf(stderr, "Error: failed to add key info\n"); goto done; } /* set key name so we can lookup key when needed */ if(xmlSecTmplKeyInfoAddKeyName(keyInfoNode2, key_name) == NULL) { - fprintf(stderr, "Error: failed to add key name\n"); + fprintf(stderr, "Error: failed to add key name\n"); goto done; } /* create encryption context */ encCtx = xmlSecEncCtxCreate(mngr); if(encCtx == NULL) { - fprintf(stderr,"Error: failed to create encryption context\n"); + fprintf(stderr,"Error: failed to create encryption context\n"); goto done; } /* generate a Triple DES key */ encCtx->encKey = xmlSecKeyGenerate(xmlSecKeyDataDesId, 192, xmlSecKeyDataTypeSession); if(encCtx->encKey == NULL) { - fprintf(stderr,"Error: failed to generate session des key\n"); + fprintf(stderr,"Error: failed to generate session des key\n"); goto done; } /* encrypt the data */ if(xmlSecEncCtxXmlEncrypt(encCtx, encDataNode, xmlDocGetRootElement(doc)) < 0) { - fprintf(stderr,"Error: encryption failed\n"); + fprintf(stderr,"Error: encryption failed\n"); goto done; } diff --git a/docs/api/xmlsec-notes-keys-mngr-verify-decrypt.html b/docs/api/xmlsec-notes-keys-mngr-verify-decrypt.html index 9781ff32..1589f3d8 100644 --- a/docs/api/xmlsec-notes-keys-mngr-verify-decrypt.html +++ b/docs/api/xmlsec-notes-keys-mngr-verify-decrypt.html @@ -99,11 +99,11 @@ load_des_keys(char** files, int files_size) { */ mngr = xmlSecKeysMngrCreate(); if(mngr == NULL) { - fprintf(stderr, "Error: failed to create keys manager.\n"); + fprintf(stderr, "Error: failed to create keys manager.\n"); return(NULL); } if(xmlSecCryptoAppDefaultKeysMngrInit(mngr) < 0) { - fprintf(stderr, "Error: failed to initialize keys manager.\n"); + fprintf(stderr, "Error: failed to initialize keys manager.\n"); xmlSecKeysMngrDestroy(mngr); return(NULL); } @@ -114,14 +114,14 @@ load_des_keys(char** files, int files_size) { /* load DES key */ key = xmlSecKeyReadBinaryFile(xmlSecKeyDataDesId, files[i]); if(key == NULL) { - fprintf(stderr,"Error: failed to load des key from binary file \"%s\"\n", files[i]); + fprintf(stderr,"Error: failed to load des key from binary file \"%s\"\n", files[i]); xmlSecKeysMngrDestroy(mngr); return(NULL); } /* set key name to the file name, this is just an example! */ if(xmlSecKeySetName(key, BAD_CAST files[i]) < 0) { - fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", files[i]); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", files[i]); xmlSecKeyDestroy(key); xmlSecKeysMngrDestroy(mngr); return(NULL); @@ -131,7 +131,7 @@ load_des_keys(char** files, int files_size) { * for destroying key */ if(xmlSecCryptoAppDefaultKeysMngrAdoptKey(mngr, key) < 0) { - fprintf(stderr,"Error: failed to add key from \"%s\" to keys manager\n", files[i]); + fprintf(stderr,"Error: failed to add key from \"%s\" to keys manager\n", files[i]); xmlSecKeyDestroy(key); xmlSecKeysMngrDestroy(mngr); return(NULL); diff --git a/docs/api/xmlsec-notes-keys.html b/docs/api/xmlsec-notes-keys.html index 1cf86580..c89e00fc 100644 --- a/docs/api/xmlsec-notes-keys.html +++ b/docs/api/xmlsec-notes-keys.html @@ -63,20 +63,20 @@ <p>A key in XML Security Library is a representation of the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo" target="_top"><dsig:KeyInfo/></a> element and consist of several key data objects. - The "value" key data usually contains raw key material (or handlers to + The "value" key data usually contains raw key material (or handlers to key material) required to execute particular crypto transform. Other key data objects may contain any additional information about the key. All the key data objects in the key are associated with the same key material. For example, if a DSA key material has both an X509 certificate and a PGP data associated with it then such a key can - have a DSA key "value" and two key data objects for X509 certificate + have a DSA key "value" and two key data objects for X509 certificate and PGP key data. </p> <div class="FIGURE"> <a name="AEN326"></a><p><b>Figure 1. The key structure.</b></p> <p><img src="images/key.png" align="CENTER"></p> </div> -<p>XML Security Library has several "invisible" key data classes. +<p>XML Security Library has several "invisible" key data classes. These classes never show up in the keys data list of a key but are used for <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo" target="_top"><dsig:KeyInfo/></a> children processing (<a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName" target="_top"><dsig:KeyName/></a>, diff --git a/docs/api/xmlsec-notes-keysmngr.html b/docs/api/xmlsec-notes-keysmngr.html index c99f96b1..6c2da86c 100644 --- a/docs/api/xmlsec-notes-keysmngr.html +++ b/docs/api/xmlsec-notes-keysmngr.html @@ -77,26 +77,26 @@ processing require a common list of trusted certificates to be available. XML Security Library keeps all the common information for key data processing in a a collection of key data stores called - "keys manager". + "keys manager". </p> <div class="FIGURE"> <a name="AEN337"></a><p><b>Figure 1. The keys manager structure.</b></p> <p><img src="images/keysmngr.png" align="CENTER"></p> </div> -<p>Keys manager has a special "keys store" which lists the keys - known to the application. This "keys store" is used by XML Security +<p>Keys manager has a special "keys store" which lists the keys + known to the application. This "keys store" is used by XML Security Library to lookup keys by name, type and crypto algorithm (for example, during <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName" target="_top"><dsig:KeyName/></a> processing). The XML Security Library - provides default simple "flat list" based implementation of a default keys + provides default simple "flat list" based implementation of a default keys store. The application can replace it with any other keys store (for example, based on an SQL database). </p> <p>Keys manager is the only object in XML Security Library which is supposed to be shared by many different operations. Usually keys manager is initialized once at the application startup and later is - used by XML Security library routines in "read-only" mode. If + used by XML Security library routines in "read-only" mode. If application or crypto function need to modify any of the key data stores inside keys manager then proper synchronization must be implemented. In the same time, application can create a new keys diff --git a/docs/api/xmlsec-notes-new-crypto-functions.html b/docs/api/xmlsec-notes-new-crypto-functions.html index 5b462e06..7e6e6e4f 100644 --- a/docs/api/xmlsec-notes-new-crypto-functions.html +++ b/docs/api/xmlsec-notes-new-crypto-functions.html @@ -61,20 +61,20 @@ <h1 class="SECT1"> <a name="XMLSEC-NOTES-NEW-CRYPTO-FUNCTIONS"></a>xmlSecCryptoApp* functions.</h1> <p> The XML Security Library allows application to load multiple - "xmlsec-<crypto> libraries. To prevent symbol conflicts, - all "xmlsec-mycrypto" library names MUST start with "xmlSecMyCrypto". + "xmlsec-<crypto> libraries. To prevent symbol conflicts, + all "xmlsec-mycrypto" library names MUST start with "xmlSecMyCrypto". However, in some applications (for example, the xmlsec command line utility) that can use any crypto library, would prefer to use a generic function names where possible. - The "include/xmlsec/crypto.h" and "include/xmlsec/mycrypto/symbols.h" - include files do the magic by mapping "xmlSecMyCrypto*" to - "xmlSecCrypto*" names using "XMLSEC_CRYPTO_*" defines. + The "include/xmlsec/crypto.h" and "include/xmlsec/mycrypto/symbols.h" + include files do the magic by mapping "xmlSecMyCrypto*" to + "xmlSecCrypto*" names using "XMLSEC_CRYPTO_*" defines. </p> <p> In order to build xmlsec command line utility, the - "xmlsec-<crypto>" library must implement several functions. - The stubs for all these functions are provided in the "skeleton" + "xmlsec-<crypto>" library must implement several functions. + The stubs for all these functions are provided in the "skeleton" we've created. While these functions are not required to be - implemented by "xmlsec-<crypto>" library, you should consider + implemented by "xmlsec-<crypto>" library, you should consider doing so (if possible) to simplify testing (thru xmlsec command line utility) and application development. </p> diff --git a/docs/api/xmlsec-notes-new-crypto-klasses.html b/docs/api/xmlsec-notes-new-crypto-klasses.html index 041cbf7b..e1fb57dc 100644 --- a/docs/api/xmlsec-notes-new-crypto-klasses.html +++ b/docs/api/xmlsec-notes-new-crypto-klasses.html @@ -61,26 +61,26 @@ <h1 class="SECT1"> <a name="XMLSEC-NOTES-NEW-CRYPTO-KLASSES"></a>Klasses and objects.</h1> <p>The XML Security Library is written in C but it uses some OOP techniques: - the objects in the library have "klasses" and there is "klasses" inheritance. + the objects in the library have "klasses" and there is "klasses" inheritance. (see <a href="xmlsec-signature-klasses.html">signature</a> and <a href="xmlsec-encryption-klasses.html">encryption</a> klasses - diagrams). The "klass" is different from C++ "class" (btw, this is - one of the reasons why it is spelled differently). The idea of "klasses" + diagrams). The "klass" is different from C++ "class" (btw, this is + one of the reasons why it is spelled differently). The idea of "klasses" used in XML Security Library are close to one in the GLIB/GTK/GNOME and many other C projects. If you ever seen an OOP code written in C you should find everything familiar. </p> -<p>XML Security Library "klass" includes three main parts: +<p>XML Security Library "klass" includes three main parts: </p> <p></p> <ul> <li> -<p>"Klass" declaration structure that defines "klass" interfaces +<p>"Klass" declaration structure that defines "klass" interfaces and global constand data (for example, the human-readable name of - the "klass"). + the "klass"). </p> <div class="EXAMPLE"> -<a name="AEN546"></a><p><b>Example 6. Base transform "klass" and its child XPath transform "klass" structure.</b></p> +<a name="AEN546"></a><p><b>Example 6. Base transform "klass" and its child XPath transform "klass" structure.</b></p> <table border="0" bgcolor="#D8F8D8" width="90%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">struct _xmlSecTransformKlass { /* data */ size_t klassSize; @@ -121,12 +121,12 @@ static xmlSecTransformKlass xmlSecTransformXPathKlass = { </div> </li> <li> -<p>"Klass" id which is simply a pointer to the "klass" - declaration strucutre. "Klass" id is used to bind "klass" objects - to the "klass" declaration and to pass "klass" strucutre to functions. +<p>"Klass" id which is simply a pointer to the "klass" + declaration strucutre. "Klass" id is used to bind "klass" objects + to the "klass" declaration and to pass "klass" strucutre to functions. </p> <div class="EXAMPLE"> -<a name="AEN551"></a><p><b>Example 7. Base transform "klass" id declaration and its child XPath transform "klass" id implementation.</b></p> +<a name="AEN551"></a><p><b>Example 7. Base transform "klass" id declaration and its child XPath transform "klass" id implementation.</b></p> <table border="0" bgcolor="#D8F8D8" width="90%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">typedef const struct _xmlSecTransformKlass xmlSecTransformKlass, *xmlSecTransformId; ... @@ -143,8 +143,8 @@ xmlSecTransformXPathGetKlass(void) { </div> </li> <li> -<p>"Klass" object structure that contains object specific - data. The child object specific data are placed after the parent "klass" +<p>"Klass" object structure that contains object specific + data. The child object specific data are placed after the parent "klass" object data. </p> <div class="EXAMPLE"> diff --git a/docs/api/xmlsec-notes-new-crypto-sharing-results.html b/docs/api/xmlsec-notes-new-crypto-sharing-results.html index 96ff3f6d..64c0a316 100644 --- a/docs/api/xmlsec-notes-new-crypto-sharing-results.html +++ b/docs/api/xmlsec-notes-new-crypto-sharing-results.html @@ -73,15 +73,15 @@ <p></p> <ul> <li><p>Checkout the sources from <a href="http://developer.gnome.org/tools/cvs.html" target="_top">GNOME CVS</a> - (module name is "xmlsec"). + (module name is "xmlsec"). </p></li> -<li><p>Add all the new files with "cvs add" command (this will not - create files in CVS but mark them as "added" localy). You'll not be able +<li><p>Add all the new files with "cvs add" command (this will not + create files in CVS but mark them as "added" localy). You'll not be able to create new folders without a valid GNOME CVS account, let me know what you need and I'll be happy to help. </p></li> <li><p>Get a diff of all existing and new files using - "cvs -z3 diff -u -N" command. + "cvs -z3 diff -u -N" command. </p></li> <li><p>Send the resulting diff file to the xmlsec mailing list with some information about yourself so I can update the authors diff --git a/docs/api/xmlsec-notes-new-crypto-simple-keys-mngr.html b/docs/api/xmlsec-notes-new-crypto-simple-keys-mngr.html index 800aa48e..49af95e8 100644 --- a/docs/api/xmlsec-notes-new-crypto-simple-keys-mngr.html +++ b/docs/api/xmlsec-notes-new-crypto-simple-keys-mngr.html @@ -60,7 +60,7 @@ <br clear="all"><div class="SECT1"> <h1 class="SECT1"> <a name="XMLSEC-NOTES-NEW-CRYPTO-SIMPLE-KEYS-MNGR"></a>Default keys manager.</h1> -<p>Any "xmlsec-<crypto>" library implementation must provide +<p>Any "xmlsec-<crypto>" library implementation must provide a default keys store. The XML Security Library has a built-in flat list based <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID">simple keys store</a> which could be used if cryptographic library does not diff --git a/docs/api/xmlsec-notes-new-crypto-skeleton.html b/docs/api/xmlsec-notes-new-crypto-skeleton.html index 5b1b576a..adffd86f 100644 --- a/docs/api/xmlsec-notes-new-crypto-skeleton.html +++ b/docs/api/xmlsec-notes-new-crypto-skeleton.html @@ -60,8 +60,8 @@ <br clear="all"><div class="SECT1"> <h1 class="SECT1"> <a name="XMLSEC-NOTES-NEW-CRYPTO-SKELETON"></a>Creating a framework from the skeleton.</h1> -<p> The XML Security Library contains a "skeleton" for creating new - "xmlsec-<crypto>" libraries. In order to create "xmlsec-mycrypto" +<p> The XML Security Library contains a "skeleton" for creating new + "xmlsec-<crypto>" libraries. In order to create "xmlsec-mycrypto" library framework, do the following (this example assumes that you are using *nix system, adjust the commands if you are using something else): </p> @@ -87,11 +87,11 @@ cd ../../.. </div> </li> <li> -<p> Replace "skeleton" with "mycrypto" in the copied files (note that there +<p> Replace "skeleton" with "mycrypto" in the copied files (note that there are different possible cases here): </p> <div class="EXAMPLE"> -<a name="AEN501"></a><p><b>Example 2. Replacing "skeleton" with "mycrypto".</b></p> +<a name="AEN501"></a><p><b>Example 2. Replacing "skeleton" with "mycrypto".</b></p> <table border="0" bgcolor="#D8F8D8" width="90%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">for i in `ls include/xmlsec/mycrypto/* src/mycrypto/*`; do echo Processing $i ..; sed 's/skeleton/mycrypto/g' $i | \ @@ -103,7 +103,7 @@ done </div> </li> <li> -<p> Add "xmlsec-mycrypto" library to the "include/xmlsec/crypto.h" file: +<p> Add "xmlsec-mycrypto" library to the "include/xmlsec/crypto.h" file: </p> <div class="EXAMPLE"> <a name="AEN506"></a><p><b>Example 3. Modifying include/xmlsec/crypto.h file.</b></p> @@ -120,7 +120,7 @@ done </div> </li> <li> -<p> Add "xmlsec-crypto" library to the configure.in file (for *nix systems; +<p> Add "xmlsec-crypto" library to the configure.in file (for *nix systems; for Windows you need to modify win32/confgure.js and win32/Makefile.msvc files, see win32/README.txt for details): </p> @@ -129,61 +129,61 @@ done <table border="0" bgcolor="#D8F8D8" width="90%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">dnl ========================================================================== dnl See if we can find MyCrypto dnl ========================================================================== -XMLSEC_MYCRYPTO_DEFINES="" -MYCRYPTO_CONFIG="mycrypto-config" # TODO -MYCRYPTO_WITHOUT="no" -MYCRYPTO_MIN_VERSION="0.0.0" # TODO -MYCRYPTO_VERSION="" -MYCRYPTO_PREFIX="" -MYCRYPTO_CFLAGS="" -MYCRYPTO_LIBS="" -MYCRYPTO_LDADDS="" +XMLSEC_MYCRYPTO_DEFINES="" +MYCRYPTO_CONFIG="mycrypto-config" # TODO +MYCRYPTO_WITHOUT="no" +MYCRYPTO_MIN_VERSION="0.0.0" # TODO +MYCRYPTO_VERSION="" +MYCRYPTO_PREFIX="" +MYCRYPTO_CFLAGS="" +MYCRYPTO_LIBS="" +MYCRYPTO_LDADDS="" AC_MSG_CHECKING(for mycrypto libraries >= $MYCRYPTO_MIN_VERSION) AC_ARG_WITH(mycrypto, [ --with-mycrypto=[PFX] mycrypto location]) -if test "$with_mycrypto" = "no" ; then - MYCRYPTO_WITHOUT="yes" - XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST mycrypto" +if test "$with_mycrypto" = "no" ; then + MYCRYPTO_WITHOUT="yes" + XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST mycrypto" AC_MSG_RESULT(no) else - if test "$with_mycrypto" != "" ; then + if test "$with_mycrypto" != "" ; then MYCRYPTO_PREFIX=$with_mycrypto MYCRYPTO_CONFIG=$MYCRYPTO_PREFIX/bin/$MYCRYPTO_CONFIG fi if ! $MYCRYPTO_CONFIG --version > /dev/null 2>&1 then - MYCRYPTO_WITHOUT="yes" - if test "$with_mycrypto" != "" ; then + MYCRYPTO_WITHOUT="yes" + if test "$with_mycrypto" != "" ; then AC_MSG_ERROR(Unable to find mycrypto at '$with_mycrypto') fi else - vers=`$MYCRYPTO_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - minvers=`echo $MYCRYPTO_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - if test "$vers" -ge "$minvers" + vers=`$MYCRYPTO_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + minvers=`echo $MYCRYPTO_MIN_VERSION | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + if test "$vers" -ge "$minvers" then - MYCRYPTO_LIBS="`$MYCRYPTO_CONFIG --libs`" - MYCRYPTO_CFLAGS="`$MYCRYPTO_CONFIG --cflags`" - MYCRYPTO_VERSION="`$MYCRYPTO_CONFIG --version`" + MYCRYPTO_LIBS="`$MYCRYPTO_CONFIG --libs`" + MYCRYPTO_CFLAGS="`$MYCRYPTO_CONFIG --cflags`" + MYCRYPTO_VERSION="`$MYCRYPTO_CONFIG --version`" else AC_MSG_ERROR(You need at least mycrypto $MYCRYPTO_MIN_VERSION for this version of $PACKAGE) fi fi dnl update crypt libraries list - if test "$MYCRYPTO_WITHOUT" = "no" ; + if test "$MYCRYPTO_WITHOUT" = "no" ; then dnl first crypto library is default one - if test "z$XMLSEC_CRYPTO" = "z" + if test "z$XMLSEC_CRYPTO" = "z" then - XMLSEC_CRYPTO="mycrypto" - XMLSEC_CRYPTO_LIB="xmlsec1-mycrypto" - XMLSEC_CRYPTO_CFLAGS="$MYCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MYCRYPTO=1" - XMLSEC_CRYPTO_LIBS="$MYCRYPTO_LIBS" - XMLSEC_CRYPTO_LDADDS="$MYCRYPTO_LDADDS" + XMLSEC_CRYPTO="mycrypto" + XMLSEC_CRYPTO_LIB="xmlsec1-mycrypto" + XMLSEC_CRYPTO_CFLAGS="$MYCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MYCRYPTO=1" + XMLSEC_CRYPTO_LIBS="$MYCRYPTO_LIBS" + XMLSEC_CRYPTO_LDADDS="$MYCRYPTO_LDADDS" fi - XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST mycrypto" + XMLSEC_CRYPTO_LIST="$XMLSEC_CRYPTO_LIST mycrypto" AC_MSG_RESULT(yes ('$MYCRYPTO_VERSION')) else - XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST mycrypto" + XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST mycrypto" AC_MSG_RESULT(no) fi fi @@ -207,7 +207,7 @@ src/mycrypto/Makefile </pre></td></tr></table> </div> </li> -<li><p>Modify "xmlsec.spec.in" file to create "xmlsec-mycrypto" +<li><p>Modify "xmlsec.spec.in" file to create "xmlsec-mycrypto" RPM (if necessary). </p></li> </ul> diff --git a/docs/api/xmlsec-notes-new-crypto-transforms.html b/docs/api/xmlsec-notes-new-crypto-transforms.html index ef696b54..abb9a534 100644 --- a/docs/api/xmlsec-notes-new-crypto-transforms.html +++ b/docs/api/xmlsec-notes-new-crypto-transforms.html @@ -61,7 +61,7 @@ <h1 class="SECT1"> <a name="XMLSEC-NOTES-NEW-CRYPTO-TRANSFORMS"></a>Cryptographic transforms.</h1> <p>The cryptographic transforms (digests, signatures and encryption) - implementation is the main goal of "xmlsec-<crypto>" library. + implementation is the main goal of "xmlsec-<crypto>" library. Most of the cryptographic <a href="xmlsec-notes-transforms.html">transforms</a> use default <tt class="STRUCTFIELD"><i>pushBin</i></tt> and <tt class="STRUCTFIELD"><i>popBin</i></tt> methods and provide custom <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTEMETHOD">execute</a> method. @@ -76,12 +76,12 @@ one buffer). In this case, transform might keep the data in the input buffer till the next call to <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTEMETHOD">execute</a> - method. The "last" parameter of the + method. The "last" parameter of the <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTEMETHOD">execute</a> indicates that transform MUST process all the data in the input buffer and return as much as possible in the output buffer. The <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTEMETHOD">execute</a> method - might be called multiple times with non-zero "last" parameter until + might be called multiple times with non-zero "last" parameter until the transforms returns nothing in the output buffer. In addition, the transform implementation is responsible for managing the transform <tt class="STRUCTFIELD"><i>status</i></tt> @@ -98,8 +98,8 @@ </tr> <tr> <td align="LEFT" valign="TOP">xmlSecTransformStatusWorking</td> -<td align="LEFT" valign="TOP">Transform process the next (if "last" parameter is zero) or - last block of data (if "last" parameter is non-zero). +<td align="LEFT" valign="TOP">Transform process the next (if "last" parameter is zero) or + last block of data (if "last" parameter is non-zero). When transform returns all the data, it sets the <tt class="STRUCTFIELD"><i>status</i></tt> variable to xmlSecTransformStatusFinished.</td> @@ -117,7 +117,7 @@ The <a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFYMETHOD">verify</a> method is called after transform execution is finished. The <a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFYMETHOD">verify</a> method implementation - must set the "status" member to <font>xmlSecTransformStatusOk</font> + must set the "status" member to <font>xmlSecTransformStatusOk</font> if signature, hmac or digest is successfuly verified or to <font>xmlSecTransformStatusFail</font> otherwise. diff --git a/docs/api/xmlsec-notes-new-crypto.html b/docs/api/xmlsec-notes-new-crypto.html index 1d3b7b48..0362cc44 100644 --- a/docs/api/xmlsec-notes-new-crypto.html +++ b/docs/api/xmlsec-notes-new-crypto.html @@ -75,7 +75,7 @@ <h1 class="SECT1"> <a name="XMLSEC-NOTES-NEW-CRYPTO-OVERVIEW"></a>Overview.</h1> <p>XML Security Library can support practicaly any cryptographic - library. Currently, it has "out-of-the-box" support for OpenSSL, + library. Currently, it has "out-of-the-box" support for OpenSSL, NSS and GnuTLS. If your favorite library is not supported yet then you can write necessary code yourself. If you and your company (university, ...) are willing to share the results of your work I would @@ -84,8 +84,8 @@ <p> The XML Security Library <a href="xmlsec-notes-structure.html">separates</a> the cryptographic library (engine) - specific code in an "xmlsec-<crypto>" library (where "<crypto>" is - "openssl", "gnutls", "nss", etc.) which includes following items: + specific code in an "xmlsec-<crypto>" library (where "<crypto>" is + "openssl", "gnutls", "nss", etc.) which includes following items: </p> <p></p> <ul> @@ -97,8 +97,8 @@ </p></li> </ul> In this chapter, we will discuss - a task of creating "xmlsec-mycrypto" library that provides support - for your favorite "MyCrypto" cryptographic library. + a task of creating "xmlsec-mycrypto" library that provides support + for your favorite "MyCrypto" cryptographic library. </div> </div> <div class="NAVFOOTER"> diff --git a/docs/api/xmlsec-notes-overview.html b/docs/api/xmlsec-notes-overview.html index f7567c91..1b1948cb 100644 --- a/docs/api/xmlsec-notes-overview.html +++ b/docs/api/xmlsec-notes-overview.html @@ -62,7 +62,7 @@ <a name="XMLSEC-NOTES-OVERVIEW"></a>Overview.</h1> <p>XML Security Library provides support for XML Digital Signature and XML Encryption. It is based on LibXML/LibXSLT and can use - practicaly any crypto library (currently there is "out of the box" + practicaly any crypto library (currently there is "out of the box" support for OpenSSL, GnuTLS and NSS). </p> </div> diff --git a/docs/api/xmlsec-notes-sign-x509.html b/docs/api/xmlsec-notes-sign-x509.html index f3ab18d7..38c02d0f 100644 --- a/docs/api/xmlsec-notes-sign-x509.html +++ b/docs/api/xmlsec-notes-sign-x509.html @@ -81,13 +81,13 @@ <table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"> /* load private key, assuming that there is not password */ key = xmlSecCryptoAppKeyLoad(key_file, xmlSecKeyDataFormatPem, NULL, NULL, NULL); if(key == NULL) { - fprintf(stderr,"Error: failed to load private pem key from \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to load private pem key from \"%s\"\n", key_file); goto done; } /* load certificate and add to the key */ if(xmlSecCryptoAppKeyCertLoad(key, cert_file, xmlSecKeyDataFormatPem) < 0) { - fprintf(stderr,"Error: failed to load pem certificate \"%s\"\n", cert_file); + fprintf(stderr,"Error: failed to load pem certificate \"%s\"\n", cert_file); goto done; } </pre></td></tr></table> @@ -105,7 +105,7 @@ signNode = xmlSecTmplSignatureCreate(doc, xmlSecTransformExclC14NId, xmlSecTransformRsaSha1Id, NULL); if(signNode == NULL) { - fprintf(stderr, "Error: failed to create signature template\n"); + fprintf(stderr, "Error: failed to create signature template\n"); goto done; } @@ -116,25 +116,25 @@ refNode = xmlSecTmplSignatureAddReference(signNode, xmlSecTransformSha1Id, NULL, NULL, NULL); if(refNode == NULL) { - fprintf(stderr, "Error: failed to add reference to signature template\n"); + fprintf(stderr, "Error: failed to add reference to signature template\n"); goto done; } /* add enveloped transform */ if(xmlSecTmplReferenceAddTransform(refNode, xmlSecTransformEnvelopedId) == NULL) { - fprintf(stderr, "Error: failed to add enveloped transform to reference\n"); + fprintf(stderr, "Error: failed to add enveloped transform to reference\n"); goto done; } /* add <dsig:KeyInfo/> and <dsig:X509Data/> */ keyInfoNode = xmlSecTmplSignatureEnsureKeyInfo(signNode, NULL); if(keyInfoNode == NULL) { - fprintf(stderr, "Error: failed to add key info\n"); + fprintf(stderr, "Error: failed to add key info\n"); goto done; } if(xmlSecTmplKeyInfoAddX509Data(keyInfoNode) == NULL) { - fprintf(stderr, "Error: failed to add X509Data node\n"); + fprintf(stderr, "Error: failed to add X509Data node\n"); goto done; } </pre></td></tr></table> diff --git a/docs/api/xmlsec-notes-sign.html b/docs/api/xmlsec-notes-sign.html index 4e8b03c2..cd793ce6 100644 --- a/docs/api/xmlsec-notes-sign.html +++ b/docs/api/xmlsec-notes-sign.html @@ -116,40 +116,40 @@ sign_file(const char* tmpl_file, const char* key_file) { /* load template */ doc = xmlParseFile(tmpl_file); if ((doc == NULL) || (xmlDocGetRootElement(doc) == NULL)){ - fprintf(stderr, "Error: unable to parse file \"%s\"\n", tmpl_file); + fprintf(stderr, "Error: unable to parse file \"%s\"\n", tmpl_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", tmpl_file); + fprintf(stderr, "Error: start node not found in \"%s\"\n", tmpl_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"); + fprintf(stderr,"Error: failed to create signature context\n"); goto done; } /* load private key, assuming that there is not password */ dsigCtx->signKey = xmlSecCryptoAppKeyLoad(key_file, xmlSecKeyDataFormatPem, NULL, NULL, NULL); if(dsigCtx->signKey == NULL) { - fprintf(stderr,"Error: failed to load private pem key from \"%s\"\n", key_file); + fprintf(stderr,"Error: failed to load private pem key from \"%s\"\n", key_file); 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); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", key_file); goto done; } /* sign the template */ if(xmlSecDSigCtxSign(dsigCtx, node) < 0) { - fprintf(stderr,"Error: signature failed\n"); + fprintf(stderr,"Error: signature failed\n"); goto done; } diff --git a/docs/api/xmlsec-notes-simple-keys-store.html b/docs/api/xmlsec-notes-simple-keys-store.html index 9455136c..5f5e5eaf 100644 --- a/docs/api/xmlsec-notes-simple-keys-store.html +++ b/docs/api/xmlsec-notes-simple-keys-store.html @@ -97,11 +97,11 @@ load_keys(char** files, int files_size) { */ mngr = xmlSecKeysMngrCreate(); if(mngr == NULL) { - fprintf(stderr, "Error: failed to create keys manager.\n"); + fprintf(stderr, "Error: failed to create keys manager.\n"); return(NULL); } if(xmlSecCryptoAppDefaultKeysMngrInit(mngr) < 0) { - fprintf(stderr, "Error: failed to initialize keys manager.\n"); + fprintf(stderr, "Error: failed to initialize keys manager.\n"); xmlSecKeysMngrDestroy(mngr); return(NULL); } @@ -112,14 +112,14 @@ load_keys(char** files, int files_size) { /* load key */ key = xmlSecCryptoAppKeyLoad(files[i], xmlSecKeyDataFormatPem, NULL, NULL, NULL); if(key == NULL) { - fprintf(stderr,"Error: failed to load pem key from \"%s\"\n", files[i]); + fprintf(stderr,"Error: failed to load pem key from \"%s\"\n", files[i]); xmlSecKeysMngrDestroy(mngr); return(NULL); } /* set key name to the file name, this is just an example! */ if(xmlSecKeySetName(key, BAD_CAST files[i]) < 0) { - fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", files[i]); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", files[i]); xmlSecKeyDestroy(key); xmlSecKeysMngrDestroy(mngr); return(NULL); @@ -129,7 +129,7 @@ load_keys(char** files, int files_size) { * for destroying key */ if(xmlSecCryptoAppDefaultKeysMngrAdoptKey(mngr, key) < 0) { - fprintf(stderr,"Error: failed to add key from \"%s\" to keys manager\n", files[i]); + fprintf(stderr,"Error: failed to add key from \"%s\" to keys manager\n", files[i]); xmlSecKeyDestroy(key); xmlSecKeysMngrDestroy(mngr); return(NULL); diff --git a/docs/api/xmlsec-notes-transforms.html b/docs/api/xmlsec-notes-transforms.html index 0f1e29bc..b5152822 100644 --- a/docs/api/xmlsec-notes-transforms.html +++ b/docs/api/xmlsec-notes-transforms.html @@ -63,10 +63,10 @@ <p>XML Digital Signature and XML Encryption standards are very flexible and provide an XML developer many different ways to sign or encrypt any part (or even parts) of an XML document. - The key for such great flexibility is the "transforms" model. + The key for such great flexibility is the "transforms" model. Transform is defined as a method of pre-processing binary or XML data before calculating digest or signature. XML Security Library extends - this definition and names "transform" any operation performed on + this definition and names "transform" any operation performed on the data: reading data from an URI, xml parsing, xml transformation, calculation digest, encrypting or decrypting. Each XML Security Library transform provides at least one of the following callbacks: @@ -87,7 +87,7 @@ This callback is used by default implementations of the four external callbacks from the list above. For example, most of the crypto transforms could be implemented by - just implementing one "execute" callback and using default push/pop + just implementing one "execute" callback and using default push/pop binary data callbacks. However, in some cases using push/pop callbacks directly is more efficient. </p> diff --git a/docs/api/xmlsec-notes-verify-x509.html b/docs/api/xmlsec-notes-verify-x509.html index 0b9633cf..f0341551 100644 --- a/docs/api/xmlsec-notes-verify-x509.html +++ b/docs/api/xmlsec-notes-verify-x509.html @@ -78,16 +78,16 @@ <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">Certificate A (signed with B) <- Certificate B (signed with C) <- ... <- Root Certificate (signed by itself) </pre></td></tr></table> </div> - At the end of the chain there is a "Root Certificate" which + At the end of the chain there is a "Root Certificate" which is signed by itself. There is no way to verify the validity of the - root certificate and application have to "trust" it - (another name for root certificates is "trusted" certificates). + root certificate and application have to "trust" it + (another name for root certificates is "trusted" certificates). <p> Application can use <font>xmlSecCryptoAppKeysMngrCertLoad</font> - function to load both "trusted" and "un-trusted" - certificates. However, the selection of "trusted" + function to load both "trusted" and "un-trusted" + certificates. However, the selection of "trusted" certificates is very sensitive process and this function might be not implemented for some crypto engines. In this case, the - "trusted" certificates list is loaded during initialization + "trusted" certificates list is loaded during initialization or specified in crypto engine configuration files. Check XML Security Library API reference for more details. </p> @@ -119,11 +119,11 @@ load_trusted_certs(char** files, int files_size) { */ mngr = xmlSecKeysMngrCreate(); if(mngr == NULL) { - fprintf(stderr, "Error: failed to create keys manager.\n"); + fprintf(stderr, "Error: failed to create keys manager.\n"); return(NULL); } if(xmlSecCryptoAppDefaultKeysMngrInit(mngr) < 0) { - fprintf(stderr, "Error: failed to initialize keys manager.\n"); + fprintf(stderr, "Error: failed to initialize keys manager.\n"); xmlSecKeysMngrDestroy(mngr); return(NULL); } @@ -133,7 +133,7 @@ load_trusted_certs(char** files, int files_size) { /* load trusted cert */ if(xmlSecCryptoAppKeysMngrCertLoad(mngr, files[i], xmlSecKeyDataFormatPem, xmlSecKeyDataTypeTrusted) < 0) { - fprintf(stderr,"Error: failed to load pem certificate from \"%s\"\n", files[i]); + fprintf(stderr,"Error: failed to load pem certificate from \"%s\"\n", files[i]); xmlSecKeysMngrDestroy(mngr); return(NULL); } diff --git a/docs/api/xmlsec-notes-verify.html b/docs/api/xmlsec-notes-verify.html index 397bfdfb..39273973 100644 --- a/docs/api/xmlsec-notes-verify.html +++ b/docs/api/xmlsec-notes-verify.html @@ -113,48 +113,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); + 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); + 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"); + fprintf(stderr,"Error: failed to create signature context\n"); 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); + fprintf(stderr,"Error: failed to load public pem key from \"%s\"\n", key_file); 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); + 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"); + fprintf(stderr,"Error: signature verify\n"); 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 */ diff --git a/docs/api/xmlsec-templates.html b/docs/api/xmlsec-templates.html index d100c988..c7b57533 100644 --- a/docs/api/xmlsec-templates.html +++ b/docs/api/xmlsec-templates.html @@ -957,7 +957,7 @@ node <tt class="PARAMETER"><i>node</i></tt>.</p> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">int xmlSecTmplTransformAddC14NInclNamespaces (<font>xmlNodePtr</font> transformNode, const <font>xmlChar</font> *prefixList);</pre></td></tr></table> -<p>Adds "inclusive" namespaces to the ExcC14N transform node <tt class="PARAMETER"><i>node</i></tt>.</p> +<p>Adds "inclusive" namespaces to the ExcC14N transform node <tt class="PARAMETER"><i>node</i></tt>.</p> <p></p> <p></p> <table class="VARIABLELIST" border="0" cellspacing="0" cellpadding="4" width="100%" bgcolor="#FFD0D0"><tbody> @@ -968,7 +968,7 @@ node <tt class="PARAMETER"><i>node</i></tt>.</p> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN9290"><span style="white-space: nowrap"><tt class="PARAMETER"><i>prefixList</i></tt> :</span></a></td> <td align="LEFT" valign="TOP" width="80%"><p> the white space delimited list of namespace prefixes, - where "<font>default</font>" indicates the default namespace + where "<font>default</font>" indicates the default namespace (optional).</p></td> </tr> <tr> @@ -1027,7 +1027,7 @@ node <tt class="PARAMETER"><i>node</i></tt>.</p> </tr> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN9353"><span style="white-space: nowrap"><tt class="PARAMETER"><i>type</i></tt> :</span></a></td> -<td align="LEFT" valign="TOP" width="80%"><p> the XPath2 transform type ("union", "intersect" or "subtract").</p></td> +<td align="LEFT" valign="TOP" width="80%"><p> the XPath2 transform type ("union", "intersect" or "subtract").</p></td> </tr> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN9358"><span style="white-space: nowrap"><tt class="PARAMETER"><i>expression</i></tt> :</span></a></td> diff --git a/docs/api/xmlsec-transforms.html b/docs/api/xmlsec-transforms.html index c24ca1f2..0e0b6ee0 100644 --- a/docs/api/xmlsec-transforms.html +++ b/docs/api/xmlsec-transforms.html @@ -547,7 +547,7 @@ transform klasses: XPath transform, Base64 transform, ...</p> <a name="AEN9920"></a><h3> <a name="XMLSECTRANSFORMURITYPEEMPTY"></a>xmlSecTransformUriTypeEmpty</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define xmlSecTransformUriTypeEmpty 0x0001</pre></td></tr></table> -<p>The empty URI ("") type.</p> +<p>The empty URI ("") type.</p> <p></p> </div> <hr> @@ -555,7 +555,7 @@ transform klasses: XPath transform, Base64 transform, ...</p> <a name="AEN9926"></a><h3> <a name="XMLSECTRANSFORMURITYPESAMEDOCUMENT"></a>xmlSecTransformUriTypeSameDocument</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define xmlSecTransformUriTypeSameDocument 0x0002 </pre></td></tr></table> -<p>The smae document ("#...") but not empty ("") URI type.</p> +<p>The smae document ("#...") but not empty ("") URI type.</p> <p></p> </div> <hr> @@ -563,7 +563,7 @@ transform klasses: XPath transform, Base64 transform, ...</p> <a name="AEN9932"></a><h3> <a name="XMLSECTRANSFORMURITYPELOCAL"></a>xmlSecTransformUriTypeLocal</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define xmlSecTransformUriTypeLocal 0x0004</pre></td></tr></table> -<p>The local URI ("file:///....") type.</p> +<p>The local URI ("file:///....") type.</p> <p></p> </div> <hr> @@ -935,21 +935,21 @@ The caller is responsible for cleaing up returend object by calling <p>The following examples demonstrate what the URI attribute identifies and how it is dereferenced (http://www.w3.org/TR/xmldsig-core/<font>sec-ReferenceProcessingModel</font>):</p> -<p>- URI="http://example.com/bar.xml" +<p>- URI="http://example.com/bar.xml" identifies the octets that represent the external resource 'http://example.com/bar.xml', that is probably an XML document given its file extension. </p> -<p>- URI="http://example.com/bar.xml<font>chapter1</font>" +<p>- URI="http://example.com/bar.xml<font>chapter1</font>" identifies the element with ID attribute value 'chapter1' of the external XML resource 'http://example.com/bar.xml', provided as an octet stream. Again, for the sake of interoperability, the element identified as 'chapter1' should be obtained using an XPath transform rather than a URI fragment (barename XPointer resolution in external resources is not REQUIRED in this specification). </p> -<p>- URI="" +<p>- URI="" identifies the node-set (minus any comment nodes) of the XML resource containing the signature </p> -<p>- URI="<font>chapter1</font>" +<p>- URI="<font>chapter1</font>" identifies a node-set containing the element with ID attribute value 'chapter1' of the XML resource containing the signature. XML Signature (and its applications) modify this node-set to include the element plus @@ -967,7 +967,7 @@ all descendents including namespaces and attributes -- but not comments.</p> </tr> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN10283"><span style="white-space: nowrap"><tt class="PARAMETER"><i>hereNode</i></tt> :</span></a></td> -<td align="LEFT" valign="TOP" width="80%"><p> the pointer to "here" node required by some +<td align="LEFT" valign="TOP" width="80%"><p> the pointer to "here" node required by some XML transforms (may be NULL).</p></td> </tr> <tr> @@ -1425,7 +1425,7 @@ destroying returned tansform using <a href="xmlsec-transforms.html#XMLSECTRANSFO <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage, <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre></td></tr></table> <p>Reads transform from the <tt class="PARAMETER"><i>node</i></tt> as follows:</p> -<p> 1) reads "Algorithm" attribute;</p> +<p> 1) reads "Algorithm" attribute;</p> <p> 2) checks the lists of known and allowed transforms;</p> <p> 3) calls transform's create method;</p> <p> 4) calls transform's read transform node method.</p> @@ -1603,7 +1603,7 @@ function to verify binary results.</p> (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform, <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode, <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre></td></tr></table> -<p>Gets transform input (<tt class="PARAMETER"><i>mode</i></tt> is "push") or output (<tt class="PARAMETER"><i>mode</i></tt> is "pop") data +<p>Gets transform input (<tt class="PARAMETER"><i>mode</i></tt> is "push") or output (<tt class="PARAMETER"><i>mode</i></tt> is "pop") data type (binary or XML).</p> <p></p> <p></p> @@ -1985,7 +1985,7 @@ processing instructions. The output of this transform is an octet stream.</p> (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform, <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode, <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre></td></tr></table> -<p>Gets transform input (<tt class="PARAMETER"><i>mode</i></tt> is "push") or output (<tt class="PARAMETER"><i>mode</i></tt> is "pop") data +<p>Gets transform input (<tt class="PARAMETER"><i>mode</i></tt> is "push") or output (<tt class="PARAMETER"><i>mode</i></tt> is "pop") data type (binary or XML) by analyzing available pushBin/popBin/pushXml/popXml methods.</p> <p></p> @@ -2678,19 +2678,19 @@ process the data and return result in <tt class="PARAMETER"><i>nodes</i></tt>.</ </tr> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN12039"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHBINMETHOD">xmlSecTransformPushBinMethod</a> <tt class="STRUCTFIELD"><i>pushBin</i></tt></span></a></td> -<td align="LEFT" valign="TOP" width="80%"><p> the binary data "push thru chain" processing method.</p></td> +<td align="LEFT" valign="TOP" width="80%"><p> the binary data "push thru chain" processing method.</p></td> </tr> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN12045"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPBINMETHOD">xmlSecTransformPopBinMethod</a> <tt class="STRUCTFIELD"><i>popBin</i></tt></span></a></td> -<td align="LEFT" valign="TOP" width="80%"><p> the binary data "pop from chain" procesing method.</p></td> +<td align="LEFT" valign="TOP" width="80%"><p> the binary data "pop from chain" procesing method.</p></td> </tr> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN12051"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHXMLMETHOD">xmlSecTransformPushXmlMethod</a> <tt class="STRUCTFIELD"><i>pushXml</i></tt></span></a></td> -<td align="LEFT" valign="TOP" width="80%"><p> the XML data "push thru chain" processing method.</p></td> +<td align="LEFT" valign="TOP" width="80%"><p> the XML data "push thru chain" processing method.</p></td> </tr> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN12057"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPXMLMETHOD">xmlSecTransformPopXmlMethod</a> <tt class="STRUCTFIELD"><i>popXml</i></tt></span></a></td> -<td align="LEFT" valign="TOP" width="80%"><p> the XML data "pop from chain" procesing method.</p></td> +<td align="LEFT" valign="TOP" width="80%"><p> the XML data "pop from chain" procesing method.</p></td> </tr> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN12063"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTEMETHOD">xmlSecTransformExecuteMethod</a> <tt class="STRUCTFIELD"><i>execute</i></tt></span></a></td> @@ -2873,7 +2873,7 @@ value if an error occurs.</p></td> <a name="AEN12250"></a><h3> <a name="XMLSECTRANSFORMIDUNKNOWN"></a>xmlSecTransformIdUnknown</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define xmlSecTransformIdUnknown NULL</pre></td></tr></table> -<p>The "unknown" transform id (NULL).</p> +<p>The "unknown" transform id (NULL).</p> <p></p> </div> <hr> @@ -3023,7 +3023,7 @@ http://www.w3.org/TR/2001/REC-xml-c14n-20010315).</p> <a name="AEN12374"></a><h3> <a name="XMLSECTRANSFORMENVELOPEDID"></a>xmlSecTransformEnvelopedId</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define xmlSecTransformEnvelopedId</pre></td></tr></table> -<p>The "enveloped" transform klass.</p> +<p>The "enveloped" transform klass.</p> <p></p> </div> <hr> @@ -3040,7 +3040,7 @@ to match the Signature with the XML production element is removed. The output of the transform is equivalent to the output that would result from replacing T with an XPath transform containing the following XPath parameter element:</p> -<p><XPath xmlns:dsig="&dsig;"> +<p><XPath xmlns:dsig="&dsig;"> count(ancestor-or-self::dsig:Signature | <font>here</font>()/ancestor::dsig:Signature[1]) > count(ancestor-or-self::dsig:Signature)</XPath> @@ -3153,7 +3153,7 @@ http://www.w3.org/TR/xmldsig-core/<font>sec-XPath</font> for more details.</p> </tr> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN12482"><span style="white-space: nowrap"><tt class="PARAMETER"><i>hereNode</i></tt> :</span></a></td> -<td align="LEFT" valign="TOP" width="80%"><p> the pointer to "here" node.</p></td> +<td align="LEFT" valign="TOP" width="80%"><p> the pointer to "here" node.</p></td> </tr> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN12487"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td> @@ -3210,7 +3210,7 @@ then the result of these steps is logically equivalent [XHTML].</p> <a name="AEN12515"></a><h3> <a name="XMLSECTRANSFORMREMOVEXMLTAGSC14NID"></a>xmlSecTransformRemoveXmlTagsC14NId</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define xmlSecTransformRemoveXmlTagsC14NId</pre></td></tr></table> -<p>The "remove all xml tags" transform klass (used before base64 transforms).</p> +<p>The "remove all xml tags" transform klass (used before base64 transforms).</p> <p></p> </div> <hr> @@ -3219,7 +3219,7 @@ then the result of these steps is logically equivalent [XHTML].</p> <a name="XMLSECTRANSFORMREMOVEXMLTAGSC14NGETKLASS"></a>xmlSecTransformRemoveXmlTagsC14NGetKlass ()</h3> <table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformRemoveXmlTagsC14NGetKlass (void);</pre></td></tr></table> -<p>The "remove xml tags" transform klass (http://www.w3.org/TR/xmldsig-core/<font>sec-Base-64</font>): +<p>The "remove xml tags" transform klass (http://www.w3.org/TR/xmldsig-core/<font>sec-Base-64</font>): Base64 transform requires an octet stream for input. If an XPath node-set (or sufficiently functional alternative) is given as input, then it is converted to an octet stream by performing operations logically equivalent @@ -3234,7 +3234,7 @@ processing instructions. The output of this transform is an octet stream.</p> <p></p> <table class="VARIABLELIST" border="0" cellspacing="0" cellpadding="4" width="100%" bgcolor="#FFD0D0"><tbody><tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN12531"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td> -<td align="LEFT" valign="TOP" width="80%"><p>"remove xml tags" transform id.</p></td> +<td align="LEFT" valign="TOP" width="80%"><p>"remove xml tags" transform id.</p></td> </tr></tbody></table> </div> </div> diff --git a/docs/api/xmlsec-verify-with-key.html b/docs/api/xmlsec-verify-with-key.html index 43ce3a4f..ef720bf8 100644 --- a/docs/api/xmlsec-verify-with-key.html +++ b/docs/api/xmlsec-verify-with-key.html @@ -107,8 +107,8 @@ main(int argc, char **argv) { assert(argv); if(argc != 3) { - fprintf(stderr, "Error: wrong number of arguments.\n"); - fprintf(stderr, "Usage: %s <xml-file> <key-file>\n", argv[0]); + fprintf(stderr, "Error: wrong number of arguments.\n"); + fprintf(stderr, "Usage: %s <xml-file> <key-file>\n", argv[0]); return(1); } @@ -123,19 +123,19 @@ main(int argc, char **argv) { /* Init xmlsec library */ if(xmlSecInit() < 0) { - fprintf(stderr, "Error: xmlsec initialization failed.\n"); + fprintf(stderr, "Error: xmlsec initialization failed.\n"); return(-1); } /* Init crypto library */ if(xmlSecCryptoAppInit(NULL) < 0) { - fprintf(stderr, "Error: crypto initialization failed.\n"); + fprintf(stderr, "Error: crypto initialization failed.\n"); return(-1); } /* Init xmlsec-crypto library */ if(xmlSecCryptoInit() < 0) { - fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); + fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); return(-1); } @@ -183,48 +183,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); + 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); + 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"); + fprintf(stderr,"Error: failed to create signature context\n"); 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); + fprintf(stderr,"Error: failed to load public pem key from \"%s\"\n", key_file); 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); + 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"); + fprintf(stderr,"Error: signature verify\n"); 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 */ diff --git a/docs/api/xmlsec-verify-with-keys-mngr.html b/docs/api/xmlsec-verify-with-keys-mngr.html index c6830c41..edb92e63 100644 --- a/docs/api/xmlsec-verify-with-keys-mngr.html +++ b/docs/api/xmlsec-verify-with-keys-mngr.html @@ -110,8 +110,8 @@ main(int argc, char **argv) { assert(argv); if(argc < 3) { - fprintf(stderr, "Error: wrong number of arguments.\n"); - fprintf(stderr, "Usage: %s <xml-file> <key-file1> [<key-file2> [...]]\n", argv[0]); + fprintf(stderr, "Error: wrong number of arguments.\n"); + fprintf(stderr, "Usage: %s <xml-file> <key-file1> [<key-file2> [...]]\n", argv[0]); return(1); } @@ -126,19 +126,19 @@ main(int argc, char **argv) { /* Init xmlsec library */ if(xmlSecInit() < 0) { - fprintf(stderr, "Error: xmlsec initialization failed.\n"); + fprintf(stderr, "Error: xmlsec initialization failed.\n"); return(-1); } /* Init crypto library */ if(xmlSecCryptoAppInit(NULL) < 0) { - fprintf(stderr, "Error: crypto initialization failed.\n"); + fprintf(stderr, "Error: crypto initialization failed.\n"); return(-1); } /* Init xmlsec-crypto library */ if(xmlSecCryptoInit() < 0) { - fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); + fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); return(-1); } @@ -202,11 +202,11 @@ load_keys(char** files, int files_size) { */ mngr = xmlSecKeysMngrCreate(); if(mngr == NULL) { - fprintf(stderr, "Error: failed to create keys manager.\n"); + fprintf(stderr, "Error: failed to create keys manager.\n"); return(NULL); } if(xmlSecCryptoAppDefaultKeysMngrInit(mngr) < 0) { - fprintf(stderr, "Error: failed to initialize keys manager.\n"); + fprintf(stderr, "Error: failed to initialize keys manager.\n"); xmlSecKeysMngrDestroy(mngr); return(NULL); } @@ -217,14 +217,14 @@ load_keys(char** files, int files_size) { /* load key */ key = xmlSecCryptoAppKeyLoad(files[i], xmlSecKeyDataFormatPem, NULL, NULL, NULL); if(key == NULL) { - fprintf(stderr,"Error: failed to load pem key from \"%s\"\n", files[i]); + fprintf(stderr,"Error: failed to load pem key from \"%s\"\n", files[i]); xmlSecKeysMngrDestroy(mngr); return(NULL); } /* set key name to the file name, this is just an example! */ if(xmlSecKeySetName(key, BAD_CAST files[i]) < 0) { - fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", files[i]); + fprintf(stderr,"Error: failed to set key name for key from \"%s\"\n", files[i]); xmlSecKeyDestroy(key); xmlSecKeysMngrDestroy(mngr); return(NULL); @@ -234,7 +234,7 @@ load_keys(char** files, int files_size) { * for destroying key */ if(xmlSecCryptoAppDefaultKeysMngrAdoptKey(mngr, key) < 0) { - fprintf(stderr,"Error: failed to add key from \"%s\" to keys manager\n", files[i]); + fprintf(stderr,"Error: failed to add key from \"%s\" to keys manager\n", files[i]); xmlSecKeyDestroy(key); xmlSecKeysMngrDestroy(mngr); return(NULL); @@ -266,35 +266,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); + 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); + 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"); + fprintf(stderr,"Error: failed to create signature context\n"); goto done; } /* Verify signature */ if(xmlSecDSigCtxVerify(dsigCtx, node) < 0) { - fprintf(stderr,"Error: signature verify\n"); + fprintf(stderr,"Error: signature verify\n"); 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 */ diff --git a/docs/api/xmlsec-verify-with-restrictions.html b/docs/api/xmlsec-verify-with-restrictions.html index 0384d606..295f8312 100644 --- a/docs/api/xmlsec-verify-with-restrictions.html +++ b/docs/api/xmlsec-verify-with-restrictions.html @@ -120,8 +120,8 @@ main(int argc, char **argv) { 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]); + fprintf(stderr, "Error: wrong number of arguments.\n"); + fprintf(stderr, "Usage: %s <xml-file> <cert-file1> [<cert-file2> [...]]\n", argv[0]); return(1); } @@ -136,19 +136,19 @@ main(int argc, char **argv) { /* Init xmlsec library */ if(xmlSecInit() < 0) { - fprintf(stderr, "Error: xmlsec initialization failed.\n"); + fprintf(stderr, "Error: xmlsec initialization failed.\n"); return(-1); } /* Init crypto library */ if(xmlSecCryptoAppInit(NULL) < 0) { - fprintf(stderr, "Error: crypto initialization failed.\n"); + fprintf(stderr, "Error: crypto initialization failed.\n"); return(-1); } /* Init xmlsec-crypto library */ if(xmlSecCryptoInit() < 0) { - fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); + fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); return(-1); } @@ -211,11 +211,11 @@ load_trusted_certs(char** files, int files_size) { */ mngr = xmlSecKeysMngrCreate(); if(mngr == NULL) { - fprintf(stderr, "Error: failed to create keys manager.\n"); + fprintf(stderr, "Error: failed to create keys manager.\n"); return(NULL); } if(xmlSecCryptoAppDefaultKeysMngrInit(mngr) < 0) { - fprintf(stderr, "Error: failed to initialize keys manager.\n"); + fprintf(stderr, "Error: failed to initialize keys manager.\n"); xmlSecKeysMngrDestroy(mngr); return(NULL); } @@ -225,7 +225,7 @@ load_trusted_certs(char** files, int files_size) { /* load trusted cert */ if(xmlSecCryptoAppKeysMngrCertLoad(mngr, files[i], xmlSecKeyDataFormatPem, xmlSecKeyDataTypeTrusted) < 0) { - fprintf(stderr,"Error: failed to load pem certificate from \"%s\"\n", files[i]); + fprintf(stderr,"Error: failed to load pem certificate from \"%s\"\n", files[i]); xmlSecKeysMngrDestroy(mngr); return(NULL); } @@ -256,21 +256,21 @@ 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); + 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); + 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"); + fprintf(stderr,"Error: failed to create signature context\n"); goto done; } @@ -283,7 +283,7 @@ verify_file(xmlSecKeysMngrPtr mngr, const char* xml_file) { (xmlSecDSigCtxEnableSignatureTransform(dsigCtx, xmlSecTransformSha1Id) < 0) || (xmlSecDSigCtxEnableSignatureTransform(dsigCtx, xmlSecTransformRsaSha1Id) < 0)) { - fprintf(stderr,"Error: failed to limit allowed siganture transforms\n"); + fprintf(stderr,"Error: failed to limit allowed siganture transforms\n"); goto done; } if((xmlSecDSigCtxEnableReferenceTransform(dsigCtx, xmlSecTransformInclC14NId) < 0) || @@ -291,19 +291,19 @@ verify_file(xmlSecKeysMngrPtr mngr, const char* xml_file) { (xmlSecDSigCtxEnableReferenceTransform(dsigCtx, xmlSecTransformSha1Id) < 0) || (xmlSecDSigCtxEnableReferenceTransform(dsigCtx, xmlSecTransformEnvelopedId) < 0)) { - fprintf(stderr,"Error: failed to limit allowed reference transforms\n"); + fprintf(stderr,"Error: failed to limit allowed reference transforms\n"); goto done; } /* in addition, limit possible key data to valid X509 certificates only */ if(xmlSecPtrListAdd(&(dsigCtx->keyInfoReadCtx.enabledKeyData), BAD_CAST xmlSecKeyDataX509Id) < 0) { - fprintf(stderr,"Error: failed to limit allowed key data\n"); + fprintf(stderr,"Error: failed to limit allowed key data\n"); goto done; } /* Verify signature */ if(xmlSecDSigCtxVerify(dsigCtx, node) < 0) { - fprintf(stderr,"Error: signature verify\n"); + fprintf(stderr,"Error: signature verify\n"); goto done; } @@ -311,15 +311,15 @@ verify_file(xmlSecKeysMngrPtr mngr, const char* xml_file) { if((dsigCtx->status == xmlSecDSigStatusSucceeded) && (xmlSecPtrListGetSize(&(dsigCtx->signedInfoReferences)) != 1)) { - fprintf(stderr,"Error: only one reference is allowed\n"); + fprintf(stderr,"Error: only one reference is allowed\n"); 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 */ @@ -346,7 +346,7 @@ done: <p></p> <div class="INFORMALEXAMPLE"> <a name="AEN711"></a><p></p> -<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> +<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> <!-- XML Security Library example: A simple SAML response template (verify4 example). @@ -354,16 +354,16 @@ Sign it using the following command (replace __ with double dashes): ../apps/xmlsec sign __privkey rsakey.pem,rsacert.pem __output verify4-res.xml verify4-tmpl.xml --> -<Response xmlns="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" IssueInstant="2002-04-18T16:56:54Z" MajorVersion="1" MinorVersion="0" Recipient="https://shire.target.com" ResponseID="7ddc31-ed4a03d703-FB24AD27D96135B68C99FB9AACFE2FFC"> - <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"> +<Response xmlns="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" IssueInstant="2002-04-18T16:56:54Z" MajorVersion="1" MinorVersion="0" Recipient="https://shire.target.com" ResponseID="7ddc31-ed4a03d703-FB24AD27D96135B68C99FB9AACFE2FFC"> + <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"> <dsig:SignedInfo> - <dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> - <dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> - <dsig:Reference URI=""> + <dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> + <dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> + <dsig:Reference URI=""> <dsig:Transforms> - <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/> + <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/> </dsig:Transforms> - <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> + <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> <dsig:DigestValue/> </dsig:Reference> </dsig:SignedInfo> @@ -373,23 +373,23 @@ Sign it using the following command (replace __ with double dashes): </dsig:KeyInfo> </dsig:Signature> <Status> - <StatusCode Value="samlp:Success"/> + <StatusCode Value="samlp:Success"/> </Status> - <Assertion xmlns="urn:oasis:names:tc:SAML:1.0:assertion" AssertionID="7ddc31-ed4a03d735-FB24AD27D96135B68C99FB9AACFE2FFC" IssueInstant="2002-04-18T16:56:54Z" Issuer="hs.osu.edu" MajorVersion="1" MinorVersion="0"> - <Conditions NotBefore="2002-04-18T16:56:54Z" NotOnOrAfter="2002-04-18T17:01:54Z"> + <Assertion xmlns="urn:oasis:names:tc:SAML:1.0:assertion" AssertionID="7ddc31-ed4a03d735-FB24AD27D96135B68C99FB9AACFE2FFC" IssueInstant="2002-04-18T16:56:54Z" Issuer="hs.osu.edu" MajorVersion="1" MinorVersion="0"> + <Conditions NotBefore="2002-04-18T16:56:54Z" NotOnOrAfter="2002-04-18T17:01:54Z"> <AudienceRestrictionCondition> <Audience>http://middleware.internet2.edu/shibboleth/clubs/clubshib/1.0/</Audience> </AudienceRestrictionCondition> </Conditions> - <AuthenticationStatement AuthenticationInstant="2002-04-18T16:56:53Z" AuthenticationMethod="urn:mace:shibboleth:authmethod"> + <AuthenticationStatement AuthenticationInstant="2002-04-18T16:56:53Z" AuthenticationMethod="urn:mace:shibboleth:authmethod"> <Subject> - <NameIdentifier Format="urn:mace:shibboleth:1.0:handle" NameQualifier="osu.edu">foo</NameIdentifier> + <NameIdentifier Format="urn:mace:shibboleth:1.0:handle" NameQualifier="osu.edu">foo</NameIdentifier> <SubjectConfirmation> <ConfirmationMethod>urn:oasis:names:tc:SAML:1.0:cm:Bearer</ConfirmationMethod> </SubjectConfirmation> </Subject> - <SubjectLocality IPAddress="127.0.0.1"/> - <AuthorityBinding AuthorityKind="samlp:AttributeQuery" Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aa.osu.edu/"/> + <SubjectLocality IPAddress="127.0.0.1"/> + <AuthorityBinding AuthorityKind="samlp:AttributeQuery" Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aa.osu.edu/"/> </AuthenticationStatement> </Assertion> </Response></pre></td></tr></table> @@ -402,7 +402,7 @@ Sign it using the following command (replace __ with double dashes): <p></p> <div class="INFORMALEXAMPLE"> <a name="AEN716"></a><p></p> -<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> +<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> <!-- XML Security Library example: A simple SAML response template (verify4 example). @@ -410,16 +410,16 @@ This file was signed using the following command (replace __ with double dashes) ../apps/xmlsec sign __privkey rsakey.pem,rsacert.pem __output verify4-res.xml verify4-tmpl.xml --> -<Response xmlns="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" IssueInstant="2002-04-18T16:56:54Z" MajorVersion="1" MinorVersion="0" Recipient="https://shire.target.com" ResponseID="7ddc31-ed4a03d703-FB24AD27D96135B68C99FB9AACFE2FFC"> - <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"> +<Response xmlns="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" IssueInstant="2002-04-18T16:56:54Z" MajorVersion="1" MinorVersion="0" Recipient="https://shire.target.com" ResponseID="7ddc31-ed4a03d703-FB24AD27D96135B68C99FB9AACFE2FFC"> + <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"> <dsig:SignedInfo> - <dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> - <dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> - <dsig:Reference URI=""> + <dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> + <dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> + <dsig:Reference URI=""> <dsig:Transforms> - <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/> + <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/> </dsig:Transforms> - <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> + <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> <dsig:DigestValue>t1nvDq1bZXEhBIXc/DHcqIrjRyI=</dsig:DigestValue> </dsig:Reference> </dsig:SignedInfo> @@ -431,7 +431,7 @@ sl1nyCIu3AONq1w8jIPOgmITF8PpwDm0+XoQUH0P4kHJqNLphnJZY+GlPAC6VlAW 2bcAFr4Ul5yzHUBpxCDZfg==</dsig:SignatureValue> <dsig:KeyInfo> <dsig:X509Data> -<X509Certificate xmlns="http://www.w3.org/2000/09/xmldsig#">MIIE3zCCBEigAwIBAgIBBTANBgkqhkiG9w0BAQQFADCByzELMAkGA1UEBhMCVVMx +<X509Certificate xmlns="http://www.w3.org/2000/09/xmldsig#">MIIE3zCCBEigAwIBAgIBBTANBgkqhkiG9w0BAQQFADCByzELMAkGA1UEBhMCVVMx EzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVN1bm55dmFsZTE9MDsGA1UE ChM0WE1MIFNlY3VyaXR5IExpYnJhcnkgKGh0dHA6Ly93d3cuYWxla3NleS5jb20v eG1sc2VjKTEZMBcGA1UECxMQUm9vdCBDZXJ0aWZpY2F0ZTEWMBQGA1UEAxMNQWxl @@ -462,23 +462,23 @@ NJ2D</X509Certificate> </dsig:KeyInfo> </dsig:Signature> <Status> - <StatusCode Value="samlp:Success"/> + <StatusCode Value="samlp:Success"/> </Status> - <Assertion xmlns="urn:oasis:names:tc:SAML:1.0:assertion" AssertionID="7ddc31-ed4a03d735-FB24AD27D96135B68C99FB9AACFE2FFC" IssueInstant="2002-04-18T16:56:54Z" Issuer="hs.osu.edu" MajorVersion="1" MinorVersion="0"> - <Conditions NotBefore="2002-04-18T16:56:54Z" NotOnOrAfter="2002-04-18T17:01:54Z"> + <Assertion xmlns="urn:oasis:names:tc:SAML:1.0:assertion" AssertionID="7ddc31-ed4a03d735-FB24AD27D96135B68C99FB9AACFE2FFC" IssueInstant="2002-04-18T16:56:54Z" Issuer="hs.osu.edu" MajorVersion="1" MinorVersion="0"> + <Conditions NotBefore="2002-04-18T16:56:54Z" NotOnOrAfter="2002-04-18T17:01:54Z"> <AudienceRestrictionCondition> <Audience>http://middleware.internet2.edu/shibboleth/clubs/clubshib/1.0/</Audience> </AudienceRestrictionCondition> </Conditions> - <AuthenticationStatement AuthenticationInstant="2002-04-18T16:56:53Z" AuthenticationMethod="urn:mace:shibboleth:authmethod"> + <AuthenticationStatement AuthenticationInstant="2002-04-18T16:56:53Z" AuthenticationMethod="urn:mace:shibboleth:authmethod"> <Subject> - <NameIdentifier Format="urn:mace:shibboleth:1.0:handle" NameQualifier="osu.edu">foo</NameIdentifier> + <NameIdentifier Format="urn:mace:shibboleth:1.0:handle" NameQualifier="osu.edu">foo</NameIdentifier> <SubjectConfirmation> <ConfirmationMethod>urn:oasis:names:tc:SAML:1.0:cm:Bearer</ConfirmationMethod> </SubjectConfirmation> </Subject> - <SubjectLocality IPAddress="127.0.0.1"/> - <AuthorityBinding AuthorityKind="samlp:AttributeQuery" Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aa.osu.edu/"/> + <SubjectLocality IPAddress="127.0.0.1"/> + <AuthorityBinding AuthorityKind="samlp:AttributeQuery" Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aa.osu.edu/"/> </AuthenticationStatement> </Assertion> </Response></pre></td></tr></table> @@ -491,7 +491,7 @@ NJ2D</X509Certificate> <p></p> <div class="INFORMALEXAMPLE"> <a name="AEN721"></a><p></p> -<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> +<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> <!-- XML Security Library example: A simple bad SAML response template (verify4 example). @@ -499,23 +499,23 @@ Sign it using the following command (replace __ with double dashes): ../apps/xmlsec sign __privkey rsakey.pem,rsacert.pem __output verify4--bad-res.xml verify4-bad-tmpl.xml --> -<Response xmlns="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" IssueInstant="2002-04-18T16:56:54Z" MajorVersion="1" MinorVersion="0" Recipient="https://shire.target.com" ResponseID="7ddc31-ed4a03d703-FB24AD27D96135B68C99FB9AACFE2FFC"> - <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"> +<Response xmlns="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" IssueInstant="2002-04-18T16:56:54Z" MajorVersion="1" MinorVersion="0" Recipient="https://shire.target.com" ResponseID="7ddc31-ed4a03d703-FB24AD27D96135B68C99FB9AACFE2FFC"> + <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"> <dsig:SignedInfo> - <dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> - <dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> - <dsig:Reference URI=""> + <dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> + <dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> + <dsig:Reference URI=""> <dsig:Transforms> - <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/> - <dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"> - <dsig:XPath xmlns:samlp_xpath="urn:oasis:names:tc:SAML:1.0:protocol" > + <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/> + <dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"> + <dsig:XPath xmlns:samlp_xpath="urn:oasis:names:tc:SAML:1.0:protocol" > count(ancestor-or-self::samlp_xpath:Response | here()/ancestor::samlp_xpath:Response[1]) = count(ancestor-or-self::samlp_xpath:Response) </dsig:XPath> </dsig:Transform> </dsig:Transforms> - <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> + <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> <dsig:DigestValue/> </dsig:Reference> </dsig:SignedInfo> @@ -525,23 +525,23 @@ Sign it using the following command (replace __ with double dashes): </dsig:KeyInfo> </dsig:Signature> <Status> - <StatusCode Value="samlp:Success"/> + <StatusCode Value="samlp:Success"/> </Status> - <Assertion xmlns="urn:oasis:names:tc:SAML:1.0:assertion" AssertionID="7ddc31-ed4a03d735-FB24AD27D96135B68C99FB9AACFE2FFC" IssueInstant="2002-04-18T16:56:54Z" Issuer="hs.osu.edu" MajorVersion="1" MinorVersion="0"> - <Conditions NotBefore="2002-04-18T16:56:54Z" NotOnOrAfter="2002-04-18T17:01:54Z"> + <Assertion xmlns="urn:oasis:names:tc:SAML:1.0:assertion" AssertionID="7ddc31-ed4a03d735-FB24AD27D96135B68C99FB9AACFE2FFC" IssueInstant="2002-04-18T16:56:54Z" Issuer="hs.osu.edu" MajorVersion="1" MinorVersion="0"> + <Conditions NotBefore="2002-04-18T16:56:54Z" NotOnOrAfter="2002-04-18T17:01:54Z"> <AudienceRestrictionCondition> <Audience>http://middleware.internet2.edu/shibboleth/clubs/clubshib/1.0/</Audience> </AudienceRestrictionCondition> </Conditions> - <AuthenticationStatement AuthenticationInstant="2002-04-18T16:56:53Z" AuthenticationMethod="urn:mace:shibboleth:authmethod"> + <AuthenticationStatement AuthenticationInstant="2002-04-18T16:56:53Z" AuthenticationMethod="urn:mace:shibboleth:authmethod"> <Subject> - <NameIdentifier Format="urn:mace:shibboleth:1.0:handle" NameQualifier="osu.edu">foo</NameIdentifier> + <NameIdentifier Format="urn:mace:shibboleth:1.0:handle" NameQualifier="osu.edu">foo</NameIdentifier> <SubjectConfirmation> <ConfirmationMethod>urn:oasis:names:tc:SAML:1.0:cm:Bearer</ConfirmationMethod> </SubjectConfirmation> </Subject> - <SubjectLocality IPAddress="127.0.0.1"/> - <AuthorityBinding AuthorityKind="samlp:AttributeQuery" Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aa.osu.edu/"/> + <SubjectLocality IPAddress="127.0.0.1"/> + <AuthorityBinding AuthorityKind="samlp:AttributeQuery" Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aa.osu.edu/"/> </AuthenticationStatement> </Assertion> </Response></pre></td></tr></table> @@ -554,7 +554,7 @@ Sign it using the following command (replace __ with double dashes): <p></p> <div class="INFORMALEXAMPLE"> <a name="AEN726"></a><p></p> -<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> +<table border="0" bgcolor="#D8F8D8" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING"><?xml version="1.0" encoding="UTF-8"?> <!-- XML Security Library example: A simple bad SAML response (verify4 example). @@ -565,23 +565,23 @@ in a simple SAML response. This file was created from a template with the following command (replace __ with double dashes): ../apps/xmlsec sign __privkey rsakey.pem,rsacert.pem __output verify4-bad-res.xml verify4-bad-tmpl.xml --> -<Response xmlns="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" IssueInstant="2002-04-18T16:56:54Z" MajorVersion="1" MinorVersion="0" Recipient="https://shire.target.com" ResponseID="7ddc31-ed4a03d703-FB24AD27D96135B68C99FB9AACFE2FFC"> - <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"> +<Response xmlns="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" IssueInstant="2002-04-18T16:56:54Z" MajorVersion="1" MinorVersion="0" Recipient="https://shire.target.com" ResponseID="7ddc31-ed4a03d703-FB24AD27D96135B68C99FB9AACFE2FFC"> + <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"> <dsig:SignedInfo> - <dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> - <dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> - <dsig:Reference URI=""> + <dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> + <dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> + <dsig:Reference URI=""> <dsig:Transforms> - <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/> - <dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"> - <dsig:XPath xmlns:samlp_xpath="urn:oasis:names:tc:SAML:1.0:protocol"> + <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/> + <dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116"> + <dsig:XPath xmlns:samlp_xpath="urn:oasis:names:tc:SAML:1.0:protocol"> count(ancestor-or-self::samlp_xpath:Response | here()/ancestor::samlp_xpath:Response[1]) = count(ancestor-or-self::samlp_xpath:Response) </dsig:XPath> </dsig:Transform> </dsig:Transforms> - <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> + <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> <dsig:DigestValue>t1nvDq1bZXEhBIXc/DHcqIrjRyI=</dsig:DigestValue> </dsig:Reference> </dsig:SignedInfo> @@ -593,7 +593,7 @@ blHx0tnPQDtSBzQdKohJV39UgkGnL3rd5ggBzyXemjMTX8eFxNZ7bh4UgZ+Wo74W Zb4ompTc2ImxJfbpszWp8w==</dsig:SignatureValue> <dsig:KeyInfo> <dsig:X509Data> -<X509Certificate xmlns="http://www.w3.org/2000/09/xmldsig#">MIIE3zCCBEigAwIBAgIBBTANBgkqhkiG9w0BAQQFADCByzELMAkGA1UEBhMCVVMx +<X509Certificate xmlns="http://www.w3.org/2000/09/xmldsig#">MIIE3zCCBEigAwIBAgIBBTANBgkqhkiG9w0BAQQFADCByzELMAkGA1UEBhMCVVMx EzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVN1bm55dmFsZTE9MDsGA1UE ChM0WE1MIFNlY3VyaXR5IExpYnJhcnkgKGh0dHA6Ly93d3cuYWxla3NleS5jb20v eG1sc2VjKTEZMBcGA1UECxMQUm9vdCBDZXJ0aWZpY2F0ZTEWMBQGA1UEAxMNQWxl @@ -624,23 +624,23 @@ NJ2D</X509Certificate> </dsig:KeyInfo> </dsig:Signature> <Status> - <StatusCode Value="samlp:Success"/> + <StatusCode Value="samlp:Success"/> </Status> - <Assertion xmlns="urn:oasis:names:tc:SAML:1.0:assertion" AssertionID="7ddc31-ed4a03d735-FB24AD27D96135B68C99FB9AACFE2FFC" IssueInstant="2002-04-18T16:56:54Z" Issuer="hs.osu.edu" MajorVersion="1" MinorVersion="0"> - <Conditions NotBefore="2002-04-18T16:56:54Z" NotOnOrAfter="2002-04-18T17:01:54Z"> + <Assertion xmlns="urn:oasis:names:tc:SAML:1.0:assertion" AssertionID="7ddc31-ed4a03d735-FB24AD27D96135B68C99FB9AACFE2FFC" IssueInstant="2002-04-18T16:56:54Z" Issuer="hs.osu.edu" MajorVersion="1" MinorVersion="0"> + <Conditions NotBefore="2002-04-18T16:56:54Z" NotOnOrAfter="2002-04-18T17:01:54Z"> <AudienceRestrictionCondition> <Audience>http://middleware.internet2.edu/shibboleth/clubs/clubshib/1.0/</Audience> </AudienceRestrictionCondition> </Conditions> - <AuthenticationStatement AuthenticationInstant="2002-04-18T16:56:53Z" AuthenticationMethod="urn:mace:shibboleth:authmethod"> + <AuthenticationStatement AuthenticationInstant="2002-04-18T16:56:53Z" AuthenticationMethod="urn:mace:shibboleth:authmethod"> <Subject> - <NameIdentifier Format="urn:mace:shibboleth:1.0:handle" NameQualifier="osu.edu">foo</NameIdentifier> + <NameIdentifier Format="urn:mace:shibboleth:1.0:handle" NameQualifier="osu.edu">foo</NameIdentifier> <SubjectConfirmation> <ConfirmationMethod>urn:oasis:names:tc:SAML:1.0:cm:Bearer</ConfirmationMethod> </SubjectConfirmation> </Subject> - <SubjectLocality IPAddress="127.0.0.1"/> - <AuthorityBinding AuthorityKind="samlp:AttributeQuery" Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aa.osu.edu/"/> + <SubjectLocality IPAddress="127.0.0.1"/> + <AuthorityBinding AuthorityKind="samlp:AttributeQuery" Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aa.osu.edu/"/> </AuthenticationStatement> </Assertion> </Response></pre></td></tr></table> diff --git a/docs/api/xmlsec-verify-with-x509.html b/docs/api/xmlsec-verify-with-x509.html index 0c41a6c4..78c94aa5 100644 --- a/docs/api/xmlsec-verify-with-x509.html +++ b/docs/api/xmlsec-verify-with-x509.html @@ -112,8 +112,8 @@ main(int argc, char **argv) { 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]); + fprintf(stderr, "Error: wrong number of arguments.\n"); + fprintf(stderr, "Usage: %s <xml-file> <cert-file1> [<cert-file2> [...]]\n", argv[0]); return(1); } @@ -128,19 +128,19 @@ main(int argc, char **argv) { /* Init xmlsec library */ if(xmlSecInit() < 0) { - fprintf(stderr, "Error: xmlsec initialization failed.\n"); + fprintf(stderr, "Error: xmlsec initialization failed.\n"); return(-1); } /* Init crypto library */ if(xmlSecCryptoAppInit(NULL) < 0) { - fprintf(stderr, "Error: crypto initialization failed.\n"); + fprintf(stderr, "Error: crypto initialization failed.\n"); return(-1); } /* Init xmlsec-crypto library */ if(xmlSecCryptoInit() < 0) { - fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); + fprintf(stderr, "Error: xmlsec-crypto initialization failed.\n"); return(-1); } @@ -203,11 +203,11 @@ load_trusted_certs(char** files, int files_size) { */ mngr = xmlSecKeysMngrCreate(); if(mngr == NULL) { - fprintf(stderr, "Error: failed to create keys manager.\n"); + fprintf(stderr, "Error: failed to create keys manager.\n"); return(NULL); } if(xmlSecCryptoAppDefaultKeysMngrInit(mngr) < 0) { - fprintf(stderr, "Error: failed to initialize keys manager.\n"); + fprintf(stderr, "Error: failed to initialize keys manager.\n"); xmlSecKeysMngrDestroy(mngr); return(NULL); } @@ -217,7 +217,7 @@ load_trusted_certs(char** files, int files_size) { /* load trusted cert */ if(xmlSecCryptoAppKeysMngrCertLoad(mngr, files[i], xmlSecKeyDataFormatPem, xmlSecKeyDataTypeTrusted) < 0) { - fprintf(stderr,"Error: failed to load pem certificate from \"%s\"\n", files[i]); + fprintf(stderr,"Error: failed to load pem certificate from \"%s\"\n", files[i]); xmlSecKeysMngrDestroy(mngr); return(NULL); } @@ -248,35 +248,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); + 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); + 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"); + fprintf(stderr,"Error: failed to create signature context\n"); goto done; } /* Verify signature */ if(xmlSecDSigCtxVerify(dsigCtx, node) < 0) { - fprintf(stderr,"Error: signature verify\n"); + fprintf(stderr,"Error: signature verify\n"); 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 */ diff --git a/docs/api/xmlsec-version.html b/docs/api/xmlsec-version.html index 952b365f..1c02783b 100644 --- a/docs/api/xmlsec-version.html +++ b/docs/api/xmlsec-version.html @@ -81,16 +81,16 @@ <div class="REFSECT2"> <a name="AEN12558"></a><h3> <a name="XMLSEC-VERSION-CAPS"></a>XMLSEC_VERSION</h3> -<table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define XMLSEC_VERSION "1.1.0"</pre></td></tr></table> +<table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define XMLSEC_VERSION "1.1.1"</pre></td></tr></table> <p>The library version string in the format -"<major-number>.<minor-number>.<sub-minor-number>".</p> +"<major-number>.<minor-number>.<sub-minor-number>".</p> <p></p> </div> <hr> <div class="REFSECT2"> <a name="AEN12564"></a><h3> <a name="XMLSEC-PACKAGE-CAPS"></a>XMLSEC_PACKAGE</h3> -<table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define XMLSEC_PACKAGE "xmlsec1"</pre></td></tr></table> +<table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define XMLSEC_PACKAGE "xmlsec1"</pre></td></tr></table> <p>The library packaqge name.</p> <p></p> </div> @@ -114,7 +114,7 @@ <div class="REFSECT2"> <a name="AEN12582"></a><h3> <a name="XMLSEC-VERSION-SUBMINOR-CAPS"></a>XMLSEC_VERSION_SUBMINOR</h3> -<table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define XMLSEC_VERSION_SUBMINOR 0</pre></td></tr></table> +<table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define XMLSEC_VERSION_SUBMINOR 1</pre></td></tr></table> <p>The library sub-minor version number.</p> <p></p> </div> @@ -122,9 +122,9 @@ <div class="REFSECT2"> <a name="AEN12588"></a><h3> <a name="XMLSEC-VERSION-INFO-CAPS"></a>XMLSEC_VERSION_INFO</h3> -<table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define XMLSEC_VERSION_INFO "2:0:1"</pre></td></tr></table> +<table border="0" bgcolor="#D6E8FF" width="100%" cellpadding="6"><tr><td><pre class="PROGRAMLISTING">#define XMLSEC_VERSION_INFO "2:1:1"</pre></td></tr></table> <p>The library version info string in the format -"<major-number>+<minor-number>:<sub-minor-number>:<minor-number>".</p> +"<major-number>+<minor-number>:<sub-minor-number>:<minor-number>".</p> <p></p> </div> </div> diff --git a/docs/api/xmlsec-xmldsig.html b/docs/api/xmlsec-xmldsig.html index ef157368..669dd5b8 100644 --- a/docs/api/xmlsec-xmldsig.html +++ b/docs/api/xmlsec-xmldsig.html @@ -622,7 +622,7 @@ node or in the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest" target= </tr> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN13186"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> <tt class="STRUCTFIELD"><i>dsigCtx</i></tt></span></a></td> -<td align="LEFT" valign="TOP" width="80%"><p> the pointer to "parent" <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature" target="_top"><dsig:Signature/></a> processing context.</p></td> +<td align="LEFT" valign="TOP" width="80%"><p> the pointer to "parent" <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature" target="_top"><dsig:Signature/></a> processing context.</p></td> </tr> <tr> <td align="RIGHT" valign="TOP" width="20%"><a name="AEN13193"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a> <tt class="STRUCTFIELD"><i>origin</i></tt></span></a></td> diff --git a/docs/bugs.html b/docs/bugs.html index 157de65a..c338e31b 100644 --- a/docs/bugs.html +++ b/docs/bugs.html @@ -47,7 +47,7 @@ Well, any big enough program has a bug. You simply don't know where exactly :) The best way to report a bug is to use the <a href="http://bugzilla.gnome.org/buglist.cgi?product=xmlsec">Gnome bug -tracking database</a>. Please, make sure to use the "xmlsec" module name. +tracking database</a>. Please, make sure to use the "xmlsec" module name. There is also a mailing list <a href="mailto:xmlsec@aleksey.com">xmlsec@aleksey.com</a> with <a href="http://www.aleksey.com/pipermail/xmlsec">online diff --git a/docs/download.html b/docs/download.html index 2357022e..dfdfdabd 100644 --- a/docs/download.html +++ b/docs/download.html @@ -46,10 +46,10 @@ <h1>Download</h1> </div> <h2>Stable releases.</h2> -<p>The latest stable XML Security Library version is <b>1.1.0</b>:</p> +<p>The latest stable XML Security Library version is <b>1.1.1</b>:</p> <ul> <li> - <a href="http://www.aleksey.com/xmlsec/download/xmlsec1-1.1.0.tar.gz">Sources for latest version</a> + <a href="http://www.aleksey.com/xmlsec/download/xmlsec1-1.1.1.tar.gz">Sources for latest version</a> (<a href="ftp://ftp.xmlsoft.org/xmlsec/releases">XMLSoft.org</a> and <a href="ftp://ftp.rpmfind.net/pub/XML/xmlsec/releases">RPMFind.net</a> mirrors). @@ -72,7 +72,6 @@ ports. </li> </ul> - <p>The <a href="ftp://ftp.aleksey.com/pub/xmlsec/releases/">previous releases</a> and <a href="ftp://ftp.aleksey.com/pub/xmlsec/snapshots/">daily snapshots</a> are also available (the daily snapshots are not promised to be stable or even @@ -108,12 +107,7 @@ compile).</p> All steps are usual:<br> </p> <blockquote> -<code>gunzip -c xmlsec1-xxx.tar.gz | tar xvf -</code><br> -<code>cd xmlsec1-xxxx</code><br> -<code>./configure --help</code><br> -<code>./configure [possible options] </code><br> -<code>make</code><br> -<code>make install</code><br><code>make check</code> +<code>gunzip -c xmlsec1-xxx.tar.gz | tar xvf -</code><br><code>cd xmlsec1-xxxx</code><br><code>./configure --help</code><br><code>./configure [possible options] </code><br><code>make</code><br><code>make install</code><br><code>make check</code> </blockquote> <p> The last step is optional and requires Internet connection to execute @@ -125,7 +119,6 @@ compile).</p> (the module name is <b>xmlsec</b>). The online source browser: <a href="http://cvs.gnome.org/bonsai/rview.cgi?cvsroot=/cvs/gnome&dir=xmlsec">Gnome CVS base</a> </p> - </td></tr> <tr><td> <br><br><p><a href="bugs.html">Aleksey Sanin</a></p> diff --git a/docs/faq.html b/docs/faq.html index 2923a67e..e53d117e 100644 --- a/docs/faq.html +++ b/docs/faq.html @@ -94,7 +94,7 @@ </p> <h4>2.2. How to compile xmlsec?</h4> <p> - On Unix just follow the "standard": + On Unix just follow the "standard": </p> <blockquote> <code>gunzip -c xmlsec-xxx.tar.gz | tar xvf -</code><br><code>cd xmlsec-xxxx</code><br><code>./configure --help</code><br><code>./configure [possible options] </code><br><code>make</code><br><code>make install</code><br><code>make check</code> @@ -243,7 +243,7 @@ to <code>xmlSecDSigStatusSucceeded</code>. </p> <h4>3.2. I am trying to sign an XML document and I have a warning - about "empty nodes set". Should I worry about this?</h4> + about "empty nodes set". Should I worry about this?</h4> <p> Most likely <b>yes</b>. When it's not an error from specification point of view, I can hardly imagine a real world case that @@ -253,14 +253,14 @@ For example, the following Reference element: </p> <blockquote><code> - <?xml version="1.0" encoding="UTF-8"><br> + <?xml version="1.0" encoding="UTF-8"><br> <Root><br> - <Data Id="1234"><br> + <Data Id="1234"><br> The data I want to sign<br> </Data><br> - <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><br> + <Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><br> ...<br> - <Reference URI="#1234"><br> + <Reference URI="#1234"><br> ...<br> </Reference><br> ...<br> @@ -279,9 +279,10 @@ The DTD might be directly included in the XML file or located in a standalone file. In the second case, you might load the DTD in xmlsec command line utility with "--dtd-file" option. +</p> <p> If you are using XML Security Library in your application (not the xmlsec - command line utility!) then you can do a "hack" and tell LibXML2 (and + command line utility!) then you can do a "hack" and tell LibXML2 (and XMLSec) which attributes are ID attributes without providing a DTD by calling <code>xmlAddID</code> function. However, this might make you signature non-interoperable with other XMLDSig implementations. @@ -304,7 +305,7 @@ If you are using xmlsec command line utility then you can use <code>--verification-time <time></code> option (where <code><time></code> is the local system time in the - "<code>YYYY-MM-DD HH:MM:SS</code>" format). + "<code>YYYY-MM-DD HH:MM:SS</code>" format). </p> <h4>3.4. I really like the XMLSec library but it is based on OpenSSL diff --git a/docs/index.html b/docs/index.html index f1a8c7d8..b2c58180 100644 --- a/docs/index.html +++ b/docs/index.html @@ -72,7 +72,16 @@ </p> <p><b>News</b></p> <ul> -<li>August 5 2003<br> +<li>August 21 2003<br> + The new <a href="download.html">XML Security Library 1.1.1</a> release + adds <X509Data/> node templates support to xmlsec-nss (Tej); + includes new functions for reading keys and certificates from memory + for xmlsec-core and xmlsec-openssl (Joachim); fixes several problems + in xmlsec configuration files (Roumen) and a bug in URI attribute + XInclude processing. +</li> + +<br><li>August 5 2003<br> A great patch from Tej that dramaticaly improves xmlsec-nss functionality deserves a minor version number update :). In addition to that, the new <a href="download.html">XML Security Library 1.1.0</a> @@ -124,7 +133,7 @@ The <a href="download.html">XML Security Library 1.0.0</a> release is the major upgrade from 0.0.X version. The new version includes multiple crypto engines support - (with "out of the box" support for OpenSSL, GnuTLS and NSS); + (with "out of the box" support for OpenSSL, GnuTLS and NSS); simplified and cleaned internal structure and API; several performance and memory usage improvements; new or updated documentation (tutorial, API reference manual and @@ -159,7 +168,7 @@ <td valign="top">It seems that I'll be giving a <a href="http://conferences.oreillynet.com/cs/os2003/view/e_sess/3838">presentation</a> at the <a href="http://conferences.oreilly.com/oscon/">O'Reilly Open Source Convention 2003</a> - about XML Security and XML Security Library. Stop by to say "Hello!". + about XML Security and XML Security Library. Stop by to say "Hello!". </td> </tr></table> </li> @@ -191,7 +200,7 @@ instead). The new 0.1.X API and ABI will defenetly change. However, if you plan to use XML Security Library with a new crypto engine and plan to write some code then you can start now. - The "backend" API is pretty stable and I do not expect major + The "backend" API is pretty stable and I do not expect major changes. </li> <br><li>February 21 2003<br><a href="download.html">XML Security Library 0.0.13</a> release @@ -216,7 +225,7 @@ Almost two months from previous release and a lot of minor enchancements are good reasons for the new <a href="download.html">XML Security Library 0.0.10</a> release:<br> - - added a way to specify "current time" to verify certificates + - added a way to specify "current time" to verify certificates expiration against it;<br> - implemented XML results output format for the xmlsec command line utility;<br> diff --git a/docs/news.html b/docs/news.html index ec4b57ba..9f424ad6 100644 --- a/docs/news.html +++ b/docs/news.html @@ -46,7 +46,16 @@ <h1>XML Security Library News</h1> </div> <ul> -<li>August 5 2003<br> +<li>August 21 2003<br> + The new <a href="download.html">XML Security Library 1.1.1</a> release + adds <X509Data/> node templates support to xmlsec-nss (Tej); + includes new functions for reading keys and certificates from memory + for xmlsec-core and xmlsec-openssl (Joachim); fixes several problems + in xmlsec configuration files (Roumen) and a bug in URI attribute + XInclude processing. +</li> + +<br><li>August 5 2003<br> A great patch from Tej that dramaticaly improves xmlsec-nss functionality deserves a minor version number update :). In addition to that, the new <a href="download.html">XML Security Library 1.1.0</a> @@ -96,7 +105,7 @@ The <a href="download.html">XML Security Library 1.0.0</a> release is the major upgrade from 0.0.X version. The new version includes multiple crypto engines support - (with "out of the box" support for OpenSSL, GnuTLS and NSS); + (with "out of the box" support for OpenSSL, GnuTLS and NSS); simplified and cleaned internal structure and API; several performance and memory usage improvements; new or updated documentation (tutorial, API reference manual and @@ -131,7 +140,7 @@ <td valign="top">It seems that I'll be giving a <a href="http://conferences.oreillynet.com/cs/os2003/view/e_sess/3838">presentation</a> at the <a href="http://conferences.oreilly.com/oscon/">O'Reilly Open Source Convention 2003</a> - about XML Security and XML Security Library. Stop by to say "Hello!". + about XML Security and XML Security Library. Stop by to say "Hello!". </td> </tr></table> </li> @@ -164,7 +173,7 @@ instead). The new 0.1.X API and ABI will defenetly change. However, if you plan to use XML Security Library with a new crypto engine and plan to write some code then you can start now. - The "backend" API is pretty stable and I do not expect major + The "backend" API is pretty stable and I do not expect major changes. </li> <br><li>February 21 2003<br><a href="download.html">XML Security Library 0.0.13</a> release @@ -189,7 +198,7 @@ Almost two months from previous release and a lot of minor enchancements are good reasons for the new <a href="download.html">XML Security Library 0.0.10</a> release:<br> - - added a way to specify "current time" to verify certificates + - added a way to specify "current time" to verify certificates expiration against it;<br> - implemented XML results output format for the xmlsec command line utility;<br> @@ -274,7 +283,7 @@ XML Encryption it is better to compile the library from sources and use OpenSSL 0.9.7<br> - The testDSig, testEnc and testKeys scripts merged into standalone - "xmlsec" application.<br> + "xmlsec" application.<br> - A couple minor bugs fixed.<br> </li> <br><li>April 17 2002<br> @@ -338,8 +347,8 @@ from <a href="http://lists.w3.org/Archives/Public/w3c-ietf-xmldsig/200 Gühring. This bug is critical and I have to do a <a href="download/xmlsec-0.0.1a.tar.gz"> new build.</a> <br> - - Added "--with-pedantic" configuration option and fixed all but "unused - variable" warnings (bug reported by Daniel Veillard).<br><br> + - Added "--with-pedantic" configuration option and fixed all but "unused + variable" warnings (bug reported by Daniel Veillard).<br><br> </li> <li>March 17 2002<br> The <a href="download.html">XML Security Library 0.0.1</a> diff --git a/docs/xmldsig-verifier.html b/docs/xmldsig-verifier.html index 933599e3..5ece242f 100644 --- a/docs/xmldsig-verifier.html +++ b/docs/xmldsig-verifier.html @@ -72,11 +72,11 @@ following keys: root certificates from standard root CA authorities (Verisign, etc.), Merlin's root CA used to sign interoperability tests from <a href="http://lists.w3.org/Archives/Public/w3c-ietf-xmldsig/2001AprJun/att-0033/01-merlin-xmldsig-sixteen.tar.gz">merlin-xmldsig-sixteen.tar.gz</a> -or "fake" <a href="api-0.0.x/examples/dsig5/aleksey.crt">root certificate</a> +or "fake" <a href="api-0.0.x/examples/dsig5/aleksey.crt">root certificate</a> (the corresponding <a href="api-0.0.x/examples/dsig5/aleksey.key">private key</a> -is encrypted using passphrase "1234"); +is encrypted using passphrase "1234"); </li> -<li>HMAC key "secret" (in hex, 73 65 63 72 65 74); +<li>HMAC key "secret" (in hex, 73 65 63 72 65 74); </li> <li>any key public DSA/RSA key provided in the KeyInfo element of the signature. </li> diff --git a/docs/xmldsig.html b/docs/xmldsig.html index 29a4477e..5998e266 100644 --- a/docs/xmldsig.html +++ b/docs/xmldsig.html @@ -51,7 +51,7 @@ type, whether located within the XML that includes the signature or elsewhere. </p> <p> XML Security Library supports <a href="xmldsig-interop.html">all</a> MUST/SHOULD/MAY features and algorithms
described in the W3C standard and provides API to sign prepared document templates,
-add signature(s) to a document "on-the-fly" or verify the signature(s)
+add signature(s) to a document "on-the-fly" or verify the signature(s)
in the document. </p> <p> <a href="http://www.aleksey.com/xmlsec/xmldsig-verifier.html">XML Digital Signature
Online Verifier</a> is an example of a real application based on XML
@@ -84,7 +84,7 @@ Detached</a> Signature<br> </tr> <tr> <td valign="top" align="left"> <a class="link-def" href="http://www.w3.org/TR/2000/WD-xmldsig-core-20001012/#def-SignatureEnvel%20oping">
-Enveloping</a> Signature: same document reference with fragment (URI="#Object1")<br> +Enveloping</a> Signature: same document reference with fragment (URI="#Object1")<br> </td>
<td valign="top" align="left">MUST <br> </td>
@@ -97,7 +97,7 @@ Enveloping</a> Signature: same document reference with fragment (URI="#Obje </tr> <tr> <td valign="top" align="left"> <a class="link-def" href="http://www.w3.org/TR/2000/WD-xmldsig-core-20001012/#def-SignatureEnvel%20oped">
-Enveloped</a> Signature: same document reference (URI="") with <a href="http://www.w3.org/Signature/2001/04/05-xmldsig-interop.html#sec-EnvelopedSignature">
+Enveloped</a> Signature: same document reference (URI="") with <a href="http://www.w3.org/Signature/2001/04/05-xmldsig-interop.html#sec-EnvelopedSignature">
Enveloped Signature Transform</a> .<br> </td>
<td valign="top" align="left">MUST <br> @@ -162,7 +162,7 @@ Signature element</a> generation<br> </tr> <tr> <td valign="top" align="left"> <a href="http://www.w3.org/TR/xmldsig-core/#sec-ReferenceProcessingModel"> XPointers</a>
-'#xpointer(id("<em>ID</em>"))'<br> +'#xpointer(id("<em>ID</em>"))'<br> </td>
<td valign="top" align="left">SHOULD <br> </td>
diff --git a/docs/xmlsec-man.html b/docs/xmlsec-man.html index c4a1eb82..7258c12f 100644 --- a/docs/xmlsec-man.html +++ b/docs/xmlsec-man.html @@ -47,7 +47,7 @@ </p> <hr> <a name="lbAB"> </a><h2>NAME</h2> -<p> xmlsec1 - manual page for xmlsec1 1.1.0 (openssl) <a name="lbAC"> </a> </p> +<p> xmlsec1 - manual page for xmlsec1 1.1.1 (openssl) <a name="lbAC"> </a> </p> <h2>SYNOPSIS</h2> <b>xmlsec</b><i><command> </i><p>[<i><options></i>] [<i><file></i>] <a name="lbAD"> </a> </p> <h2>DESCRIPTION</h2> @@ -74,6 +74,10 @@ <dd> encrypt data and output XML document </dd> <dt><b>--decrypt</b></dt> <dd> decrypt data from XML document </dd> +<dt><b>--xkis-server-locate</b></dt> +<dd> process data as XKMS/XKISS Locate request </dd> +<dt><b>--xkis-server-validate</b></dt> +<dd> process data as XKMS/XKISS Validate request </dd> </dl> <a name="lbAE"> </a><h2>OPTIONS</h2> <dl compact> @@ -91,7 +95,7 @@ </dd> <dt> <b>--enabled-reference-uris</b> <list> <dt></dt> </dt> -<dd> <dd>comma separated list of of the following values: "empty", "same-doc", "local","remote" to restrict possible URI attribute values for the <dsig:Reference> element </dd> +<dd> <dd>comma separated list of of the following values: "empty", "same-doc", "local","remote" to restrict possible URI attribute values for the <dsig:Reference> element </dd> </dd> <dt> <b>--binary-data</b> <file> <dt></dt> </dt> @@ -103,11 +107,11 @@ </dd> <dt> <b>--enabled-cipher-reference-uris</b> <list> <dt></dt> </dt> -<dd> <dd>comma separated list of of the following values: "empty", "same-doc", "local","remote" to restrict possible URI attribute values for the <enc:CipherReference> element </dd> +<dd> <dd>comma separated list of of the following values: "empty", "same-doc", "local","remote" to restrict possible URI attribute values for the <enc:CipherReference> element </dd> </dd> <dt> <b>--session-key</b> <keyKlass>-<keySize> <dt></dt> </dt> -<dd> <dd>generate new session <keyKlass> key of <keySize> bits size (for example, "--session des-192" generates a new 192 bits DES key for DES3 encryption) </dd> +<dd> <dd>generate new session <keyKlass> key of <keySize> bits size (for example, "--session des-192" generates a new 192 bits DES key for DES3 encryption) </dd> </dd> <dt> <b>--output</b> <filename> <dt></dt> </dt> @@ -139,15 +143,15 @@ </dd> <dt> <b>--enabled-key-data</b> <list> <dt></dt> </dt> -<dd> <dd>comma separated list of enabled key data (list of registered key data klasses is available with "--list-key-data" command); by default, all registered key data are enabled </dd> +<dd> <dd>comma separated list of enabled key data (list of registered key data klasses is available with "--list-key-data" command); by default, all registered key data are enabled </dd> </dd> <dt> <b>--enabled-retrieval-uris</b> <list> <dt></dt> </dt> -<dd> <dd>comma separated list of of the following values: "empty", "same-doc", "local","remote" to restrict possible URI attribute values for the <dsig:RetrievalMethod> element. </dd> +<dd> <dd>comma separated list of of the following values: "empty", "same-doc", "local","remote" to restrict possible URI attribute values for the <dsig:RetrievalMethod> element. </dd> </dd> <dt> <b>--gen-key[</b>:<name>] <keyKlass>-<keySize> <dt></dt> </dt> -<dd> <dd>generate new <keyKlass> key of <keySize> bits size, set the key name to <name> and add the result to keys manager (for example, "--gen:mykey rsa-1024" generates a new 1024 bits RSA key and sets it's name to "mykey") </dd> +<dd> <dd>generate new <keyKlass> key of <keySize> bits size, set the key name to <name> and add the result to keys manager (for example, "--gen:mykey rsa-1024" generates a new 1024 bits RSA key and sets it's name to "mykey") </dd> </dd> <dt> <b>--keys-file</b> <file> <dt></dt> </dt> @@ -215,7 +219,7 @@ </dd> <dt> <b>--verification-time</b> <time> <dt></dt> </dt> -<dd> <dd>the local time in "YYYY-MM-DD HH:MM:SS" format used certificates verification </dd> +<dd> <dd>the local time in "YYYY-MM-DD HH:MM:SS" format used certificates verification </dd> </dd> <dt> <b>--depth</b> <number> <dt></dt> </dt> @@ -281,7 +285,7 @@ <dd> </dd> </dl> <hr> -<p> This document was created by <a href="http://localhost/cgi-bin/man/man2html">man2html</a>, using the manual pages.<br> Time: 22:58:00 GMT, August 04, 2003 </p> +<p> This document was created by <a href="http://localhost/cgi-bin/man/man2html">man2html</a>, using the manual pages.<br> Time: 04:17:38 GMT, August 21, 2003 </p> </td></tr> <tr><td> <br><br><p><a href="bugs.html">Aleksey Sanin</a></p> diff --git a/include/xmlsec/version.h b/include/xmlsec/version.h index cbee15dd..a6aca39a 100644 --- a/include/xmlsec/version.h +++ b/include/xmlsec/version.h @@ -21,7 +21,7 @@ extern "C" { * The library version string in the format * "<major-number>.<minor-number>.<sub-minor-number>". */ -#define XMLSEC_VERSION "1.1.0" +#define XMLSEC_VERSION "1.1.1" /** * XMLSEC_PACKAGE: @@ -49,7 +49,7 @@ extern "C" { * * The library sub-minor version number. */ -#define XMLSEC_VERSION_SUBMINOR 0 +#define XMLSEC_VERSION_SUBMINOR 1 /** * XMLSEC_VERSION_INFO: @@ -57,7 +57,7 @@ extern "C" { * The library version info string in the format * "<major-number>+<minor-number>:<sub-minor-number>:<minor-number>". */ -#define XMLSEC_VERSION_INFO "2:0:1" +#define XMLSEC_VERSION_INFO "2:1:1" #ifdef __cplusplus diff --git a/man/xmlsec1-config.1 b/man/xmlsec1-config.1 index 7d5795da..a92850cf 100644 --- a/man/xmlsec1-config.1 +++ b/man/xmlsec1-config.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.29. -.TH XMLSEC1-CONFIG "1" "August 2003" "xmlsec1-config 1.1.0" "User Commands" +.TH XMLSEC1-CONFIG "1" "August 2003" "xmlsec1-config 1.1.1" "User Commands" .SH NAME -xmlsec1-config \- manual page for xmlsec1-config 1.1.0 +xmlsec1-config \- manual page for xmlsec1-config 1.1.1 .SH SYNOPSIS .B xmlsec1-config [\fIOPTION\fR]... @@ -31,5 +31,5 @@ output version information .TP \fB\-\-crypto\fR=\fILIB\fR configure with XMLSEC crypto library (one of the -following: none default openssl nss) +following: none default openssl gnutls nss) [default "openssl"] diff --git a/man/xmlsec1.1 b/man/xmlsec1.1 index bd23a963..77928c89 100644 --- a/man/xmlsec1.1 +++ b/man/xmlsec1.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.29. -.TH XMLSEC1 "1" "August 2003" "xmlsec1 1.1.0 (openssl)" "User Commands" +.TH XMLSEC1 "1" "August 2003" "xmlsec1 1.1.1 (openssl)" "User Commands" .SH NAME -xmlsec1 \- manual page for xmlsec1 1.1.0 (openssl) +xmlsec1 \- manual page for xmlsec1 1.1.1 (openssl) .SH SYNOPSIS .B xmlsec \fI<command> \fR[\fI<options>\fR] [\fI<file>\fR] @@ -38,6 +38,12 @@ encrypt data and output XML document .TP \fB\-\-decrypt\fR decrypt data from XML document +.TP +\fB\-\-xkis\-server\-locate\fR +process data as XKMS/XKISS Locate request +.TP +\fB\-\-xkis\-server\-validate\fR +process data as XKMS/XKISS Validate request .SH OPTIONS .HP \fB\-\-ignore\-manifests\fR diff --git a/tests/keys.xml b/tests/keys.xml index 0037e50a..935e2872 100644 --- a/tests/keys.xml +++ b/tests/keys.xml @@ -3,7 +3,7 @@ <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> <KeyName>test-hmac-sha1</KeyName> <KeyValue> -<HMACKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">1L+MH/T7JXzOy2I9s5Ho92b5LjEY6COL</HMACKeyValue> +<HMACKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">uf1x0REth9kosJMy/LsaLTlXpxNiVey+</HMACKeyValue> </KeyValue> </KeyInfo> <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> @@ -11,17 +11,17 @@ <KeyValue> <RSAKeyValue> <Modulus> -tKHRoHW5GI47Ht9kxN9o97x07KKpc7Qg1ETRKWrlctXAB6xHQhiVkbYJVhdXv1RQ -Ym1wH6XeJw/nmXMbY+5fQM1Q1uTXbMOUbRYx5r3f4tovR59nQ6NIoBb6tfe5BZK6 -fnjpD1MaW05wGIUy9+MFHUj3SDqxv196dEWJwR6Iqg0= +wYP7hYyFl38H78QBua4elzTTuWcYcykZJrgcRMtYfrtu8C9hVZ6IEQ+AQoorEJiZ +RBzhzNc7pgDGxz672xxjSY8t5hraHTSLJeIItq1xq6mdifIdxmOkxMbqNzSDIoc9 +1IJQWwD9ZQeDoJQBhNrFMFXAYcBUdkkW8b4zGlDIKXU= </Modulus> <Exponent> Aw== </Exponent> <PrivateExponent xmlns="http://www.aleksey.com/xmlsec/2002"> -eGvhFaPQuwl8vz+Ygz+bT9L4ncHGTSLAjYM2G5yY9zkqr8gvgWW5C86w5A+P1OLg -QZ5Kv8Ppb1/vu6ISQp7qKhPpbowG+LJHZ+GB4L3RAfkyIF+XCYkwSzvlRTuWa5uS -U7xAxQzwjt2Wq8jKIb3NxcR13RDKR0nYc3tmiKgVpis= +gQKnrl2uZP9an9gBJnQUZM3ie5oQTMYQxHq9gzI6/yefSspA478FYLUALFwctbsQ +2BNBMzonxACEhNR9PL2XhTahm+BdZ/GPAikTeUXnL1EkvY1HXBPPvwMmp+WukUW6 +49HFWmaWeoiogd1TRv7ireUTUppPVTV8XfizC7DJ0+s= </PrivateExponent> </RSAKeyValue> </KeyValue> @@ -31,25 +31,25 @@ U7xAxQzwjt2Wq8jKIb3NxcR13RDKR0nYc3tmiKgVpis= <KeyValue> <DSAKeyValue> <P> -+/iULHlbjU0BJnUEURAq5mgBoET+h+/JafnCEOdDjMdnG/MCBpks007t6awNhbWh -6oL44wKa4WZPkY3+P9lRrBWn5NT9Am+3dT+rz2N92jH18qe5rTc2yHwnVJkJ136n -HBi4+IShT2pJYndjCUJzDPg3JKSbfqs7hW6FoLS0rEc= ++M+YmSg9Z65iiSF4j+cY+0FHmz9USUvTOs64O12fpIWOmREgnYY8HiwKJC3zCNXM +toOPDKeb0+Q1ZZ6Z7UdKYZwMc8LBiOO9MRRmVPQxzrb+2J9QMEzU5biKoF0YhRgQ +uxbu1wCT4Udxwdd4Hd1e8SvSLfVyEbL0QwDzuCgpMRE= </P> <Q> -28RZIU06t5Y0r4vNDz9p03HV0h8= +k5ls9IENiKjE2paZ17kS0F6Rp/U= </Q> <G> -SlP9CEP5vla4cfBHGjsxfctJ5JSOLnoxwcYn+wKhK+b/sLdThrVcohoS3Lq39Jlw -5P78bRks6jeWBonOEXrOAldccHV6fSnMYiEPZ+RTtmq8RCkV+RXdlaqYClG4aVO/ -40aioXQHRlS7ityls0ITPWaWCZXmh4ZyBieZrtYHvpY= +g86F6RKm+QUl64zfNJLfQVmojwpYeBlxjeDHqQ0xVefirCzl/snTe7JwvMge8XBl +qZl5NDhThLfhqM1rZnMZZ3lHVSSkU9ZPaZLTZHKJ9qGSs3NVVnLiIDru2qxyhUU/ +nz82D3TzrbjSsmnQ4CRYdkpzTr1FU7h67i9NkvWJ5vQ= </G> <X xmlns="http://www.aleksey.com/xmlsec/2002"> -iaLSTFIpOFV3xrUFQ2zKIHIvJQk= +WVRGaqcmRlpoetG37Lg6fZWnr80= </X> <Y> -3FzOWWHz7mu7NeUHq0gLjj7RFZIgzKSYPwh+tFlBIxWh8ioilRTDiQRPpDcnUqLs -M+CjDXfycHIRN22wclw5QSSS/N0us1TR4bfsVKdDLZfMxewHhfcZyr3yuFltdGU0 -wJ+l17vt5NrskU/epVujnni5yBUhweh3rKzeS5hrPV8= +bd7Dz0xTAQzY208eKyn4whIgNRCxEMvWww8pNSpubTDqn1AoVr6kX2qha6nb0Kab ++zHgU1rObqN1CPzvrUZxAtutI6rReh9i77G1W8Cgnt+iWSzyv61IisfjV0Sb/gU2 +aHwD9vE8FRYdYioyCE3CSKka1gEFzEiRd66eqX8A1Tw= </Y> </DSAKeyValue> </KeyValue> @@ -57,25 +57,25 @@ wJ+l17vt5NrskU/epVujnni5yBUhweh3rKzeS5hrPV8= <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> <KeyName>test-des</KeyName> <KeyValue> -<DESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">vwbSXq5pmQgM1MH1x82wOEKcXYwHBxEi</DESKeyValue> +<DESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">5/Wqlg0ZlDied7HxHl2nslxigcYTjyfR</DESKeyValue> </KeyValue> </KeyInfo> <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> <KeyName>test-aes128</KeyName> <KeyValue> -<AESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">Q8vUR/LUN7hKeHXkHDVyhg==</AESKeyValue> +<AESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">TYl1Ul9731qzle7wTfoZQQ==</AESKeyValue> </KeyValue> </KeyInfo> <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> <KeyName>test-aes192</KeyName> <KeyValue> -<AESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">B2Zlwpxzm6EaF88GN83Mmi/xOOEw7/56</AESKeyValue> +<AESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">KIfWS5HGVLwQI/tJM6BqmC55ITGzCNxr</AESKeyValue> </KeyValue> </KeyInfo> <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> <KeyName>test-aes256</KeyName> <KeyValue> -<AESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">ulIprYY0iFVGIbPCGlKDyoRgV5a6h7xsmNn9xtQKQh8=</AESKeyValue> +<AESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">at9ofyPOOQzHVgrH6uOdn2pv+yLpmTLCzds6wPezIpE=</AESKeyValue> </KeyValue> </KeyInfo> </Keys> |