diff options
author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-07-29 16:37:41 +0000 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-07-29 16:37:41 +0000 |
commit | 3f5a5a855d9707c3c9715e5ac77619fdfb8c1abf (patch) | |
tree | ee477bea66062f86e3685bce284f1d2644d636bc | |
parent | Remove vulnerable version(s), bug 271708 (diff) | |
download | historical-3f5a5a855d9707c3c9715e5ac77619fdfb8c1abf.tar.gz historical-3f5a5a855d9707c3c9715e5ac77619fdfb8c1abf.tar.bz2 historical-3f5a5a855d9707c3c9715e5ac77619fdfb8c1abf.zip |
Version bump (bug #277876).
Package-Manager: portage-13851-svn/cvs/Linux x86_64
-rw-r--r-- | dev-libs/xmlsec/ChangeLog | 10 | ||||
-rw-r--r-- | dev-libs/xmlsec/Manifest | 6 | ||||
-rw-r--r-- | dev-libs/xmlsec/files/xmlsec-1.2.12-fix_implicit_declaration.patch | 10 | ||||
-rw-r--r-- | dev-libs/xmlsec/files/xmlsec-1.2.12-min_hmac_size.patch | 334 | ||||
-rw-r--r-- | dev-libs/xmlsec/xmlsec-1.2.12.ebuild | 60 |
5 files changed, 418 insertions, 2 deletions
diff --git a/dev-libs/xmlsec/ChangeLog b/dev-libs/xmlsec/ChangeLog index e3af27f2627e..37cdfa716d20 100644 --- a/dev-libs/xmlsec/ChangeLog +++ b/dev-libs/xmlsec/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-libs/xmlsec # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/ChangeLog,v 1.16 2009/05/03 18:08:54 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/ChangeLog,v 1.17 2009/07/29 16:37:41 arfrever Exp $ + +*xmlsec-1.2.12 (29 Jul 2009) + + 29 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + +xmlsec-1.2.12.ebuild, + +files/xmlsec-1.2.12-fix_implicit_declaration.patch, + +files/xmlsec-1.2.12-min_hmac_size.patch: + Version bump (bug #277876). 03 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> xmlsec-1.2.11.ebuild, +files/xmlsec-1.2.11-gnutls.patch: diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest index 536bdd036fe3..60abcee2d702 100644 --- a/dev-libs/xmlsec/Manifest +++ b/dev-libs/xmlsec/Manifest @@ -1,5 +1,9 @@ AUX xmlsec-1.2.11-gnutls.patch 624 RMD160 c04f4640d27471a49bb7cf9a77af9a494c399595 SHA1 bccbe8d0acc940bf62dee46baf06bb72d0954c68 SHA256 3b367d0bc7b36da95692eb5d70b28c8651e956c23b4563c48bed2b9672c2f46a +AUX xmlsec-1.2.12-fix_implicit_declaration.patch 206 RMD160 ea939f39f23faaa84fc0805470792fce8decf24c SHA1 45987a0d6986578ca5a013837a3612b61dc6db00 SHA256 c1263c7c77ca21897fbc4f5bdd61dda51d4635337ed3a7f10f67ab8a19491f02 +AUX xmlsec-1.2.12-min_hmac_size.patch 17041 RMD160 bda05750742a62a95be2d3396478f1311c63306c SHA1 aa826011ca0b8a44f5528ab2d425ff8ddd83e1e8 SHA256 7f6023763ce83100f28b6613b48aa7160f40ef5b6c6177e5b3d52ed3359850ad DIST xmlsec1-1.2.11.tar.gz 1641811 RMD160 9336620005a7cd933a75db4b287daab655b87c9c SHA1 b7ec2bfd1b44b29dabf8ba5d37661da1143f0f64 SHA256 d802bb84e8ef6b95abab45c6e9c381a62d0e38fb40a44044eff126add57fdc96 +DIST xmlsec1-1.2.12.tar.gz 1637747 RMD160 92d1280483863b0008186876f5a4c3248dabb295 SHA1 73645f47d488029b11a41719cb818968786144fb SHA256 1d80e9706c4ce27c603fa905c7bad2535b2f74c7f211eec754cd04ce60b33a0f EBUILD xmlsec-1.2.11.ebuild 1339 RMD160 5e3d7b38c81da4e7b74d9e1c636f28d45687c55a SHA1 62f0c296f8983938decf9ea1654c47d859720122 SHA256 1e76794e5c222b78939138dcd1b3ba8e5ae1cef874f69642f0fe6f6241ade19f -MISC ChangeLog 2416 RMD160 c5a305feccd6ffa7750f888af5b1ce8dd6241128 SHA1 aa0f230361f085dc1a2edb0da9b1338695aa8898 SHA256 f33aa6d67c60577a7cbcf535f942125df2632670860a18e7f34883b5be43d2f9 +EBUILD xmlsec-1.2.12.ebuild 1617 RMD160 f2c9eb4793fdbf604a6d436a912c8bf67b584ea0 SHA1 4f0f04d6be863ee6d0d34e7d8723816ea043a740 SHA256 2b3652d751cde0f20dd10a2be0010b6f701aebf2f664bf65b86ca9fa0e088f0e +MISC ChangeLog 2674 RMD160 b97be105c8872103ae21f4dfa9da5f1d203c12a7 SHA1 222081622de08df8924ddda4b8c78af5bc79ace9 SHA256 70542414993dfbf045f6c76ee6646e1d3527d3cc8bab9fd17b195046dbb2590a MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10 diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.12-fix_implicit_declaration.patch b/dev-libs/xmlsec/files/xmlsec-1.2.12-fix_implicit_declaration.patch new file mode 100644 index 000000000000..2f6cfd6e02b0 --- /dev/null +++ b/dev-libs/xmlsec/files/xmlsec-1.2.12-fix_implicit_declaration.patch @@ -0,0 +1,10 @@ +--- src/openssl/hmac.c ++++ src/openssl/hmac.c +@@ -24,6 +24,7 @@ + + #include <openssl/hmac.h> + ++#include <xmlsec/base64.h> + #include <xmlsec/xmlsec.h> + #include <xmlsec/xmltree.h> + #include <xmlsec/keys.h> diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.12-min_hmac_size.patch b/dev-libs/xmlsec/files/xmlsec-1.2.12-min_hmac_size.patch new file mode 100644 index 000000000000..a6cdeebae841 --- /dev/null +++ b/dev-libs/xmlsec/files/xmlsec-1.2.12-min_hmac_size.patch @@ -0,0 +1,334 @@ +http://git.gnome.org/cgit/xmlsec/commit/?id=c07c1961dc8a08d81dad6c1fd984acd09ae99028 + +--- src/gnutls/hmac.c ++++ src/gnutls/hmac.c +@@ -23,8 +23,9 @@ + #include <xmlsec/gnutls/app.h> + #include <xmlsec/gnutls/crypto.h> + +-#define XMLSEC_GNUTLS_MIN_HMAC_SIZE 40 +-#define XMLSEC_GNUTLS_MAX_HMAC_SIZE 128 ++/* sizes in bits */ ++#define XMLSEC_GNUTLS_MIN_HMAC_SIZE 80 ++#define XMLSEC_GNUTLS_MAX_HMAC_SIZE (128 * 8) + + /************************************************************************** + * +@@ -65,7 +66,7 @@ typedef struct _xmlSecGnuTLSHmacCtx xmlSecGnuTLSHmacCtx, *xmlSecGnuTLSHmacCtxPt + struct _xmlSecGnuTLSHmacCtx { + int digest; + GcryMDHd digestCtx; +- xmlSecByte dgst[XMLSEC_GNUTLS_MAX_HMAC_SIZE]; ++ xmlSecByte dgst[XMLSEC_GNUTLS_MAX_HMAC_SIZE / 8]; + xmlSecSize dgstSize; /* dgst size in bits */ + }; + +--- src/nss/hmac.c ++++ src/nss/hmac.c +@@ -26,8 +26,9 @@ + #include <xmlsec/nss/app.h> + #include <xmlsec/nss/crypto.h> + +-#define XMLSEC_NSS_MIN_HMAC_SIZE 40 +-#define XMLSEC_NSS_MAX_HMAC_SIZE 128 ++/* sizes in bits */ ++#define XMLSEC_NSS_MIN_HMAC_SIZE 80 ++#define XMLSEC_NSS_MAX_HMAC_SIZE (128 * 8) + + /************************************************************************** + * +@@ -68,7 +69,7 @@ typedef struct _xmlSecNssHmacCtx xmlSecNssHmacCtx, *xmlSecNssHmacCtxPtr; + struct _xmlSecNssHmacCtx { + CK_MECHANISM_TYPE digestType; + PK11Context* digestCtx; +- xmlSecByte dgst[XMLSEC_NSS_MAX_HMAC_SIZE]; ++ xmlSecByte dgst[XMLSEC_NSS_MAX_HMAC_SIZE / 8]; + xmlSecSize dgstSize; /* dgst size in bits */ + }; + +--- src/openssl/hmac.c ++++ src/openssl/hmac.c +@@ -32,7 +32,9 @@ + + #include <xmlsec/openssl/crypto.h> + +-#define XMLSEC_OPENSSL_MIN_HMAC_SIZE 40 ++/* sizes in bits */ ++#define XMLSEC_OPENSSL_MIN_HMAC_SIZE 80 ++#define XMLSEC_OPENSSL_MAX_HMAC_SIZE (EVP_MAX_MD_SIZE * 8) + + /************************************************************************** + * +@@ -74,7 +76,7 @@ struct _xmlSecOpenSSLHmacCtx { + const EVP_MD* hmacDgst; + HMAC_CTX hmacCtx; + int ctxInitialized; +- xmlSecByte dgst[EVP_MAX_MD_SIZE]; ++ xmlSecByte dgst[XMLSEC_OPENSSL_MAX_HMAC_SIZE]; + xmlSecSize dgstSize; /* dgst size in bits */ + }; + +@@ -380,6 +382,14 @@ xmlSecOpenSSLHmacVerify(xmlSecTransformPtr transform, + + /* compare the digest size in bytes */ + if(dataSize != ((ctx->dgstSize + 7) / 8)){ ++ /* NO COMMIT */ ++ xmlChar* a; ++ mask = last_byte_masks[ctx->dgstSize % 8]; ++ ctx->dgst[dataSize - 1] &= mask; ++ a = xmlSecBase64Encode(ctx->dgst, (ctx->dgstSize + 7) / 8, -1); ++ fprintf(stderr, "%s\n", a); ++ xmlFree(a); ++ + xmlSecError(XMLSEC_ERRORS_HERE, + xmlSecErrorsSafeString(xmlSecTransformGetName(transform)), + NULL, +--- tests/aleksey-xmldsig-01/enveloping-md5-hmac-md5-64.tmpl ++++ tests/aleksey-xmldsig-01/enveloping-md5-hmac-md5-64.tmpl +@@ -3,7 +3,7 @@ + <SignedInfo> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> + <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-md5"> +- <HMACOutputLength>64</HMACOutputLength> ++ <HMACOutputLength>80</HMACOutputLength> + </SignatureMethod> + <Reference URI="#object"> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/> +--- tests/aleksey-xmldsig-01/enveloping-md5-hmac-md5-64.xml ++++ tests/aleksey-xmldsig-01/enveloping-md5-hmac-md5-64.xml +@@ -3,13 +3,13 @@ + <SignedInfo> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> + <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-md5"> +- <HMACOutputLength>64</HMACOutputLength> ++ <HMACOutputLength>80</HMACOutputLength> + </SignatureMethod> + <Reference URI="#object"> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/> + <DigestValue>/u+47lA0BK55De4qRAg16w==</DigestValue> + </Reference> + </SignedInfo> +- <SignatureValue>j202k+irNYE=</SignatureValue> ++ <SignatureValue>8woIGhwIlkw9Gw==</SignatureValue> + <Object Id="object">some text</Object> + </Signature> +--- tests/aleksey-xmldsig-01/enveloping-ripemd160-hmac-ripemd160-64.tmpl ++++ tests/aleksey-xmldsig-01/enveloping-ripemd160-hmac-ripemd160-64.tmpl +@@ -3,7 +3,7 @@ + <SignedInfo> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> + <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160"> +- <HMACOutputLength>64</HMACOutputLength> ++ <HMACOutputLength>80</HMACOutputLength> + </SignatureMethod> + <Reference URI="#object"> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/> +--- tests/aleksey-xmldsig-01/enveloping-ripemd160-hmac-ripemd160-64.xml ++++ tests/aleksey-xmldsig-01/enveloping-ripemd160-hmac-ripemd160-64.xml +@@ -3,13 +3,13 @@ + <SignedInfo> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> + <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160"> +- <HMACOutputLength>64</HMACOutputLength> ++ <HMACOutputLength>80</HMACOutputLength> + </SignatureMethod> + <Reference URI="#object"> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/> + <DigestValue>Ofs8NqfoXX+r0Cas3GRY2GbzhPo=</DigestValue> + </Reference> + </SignedInfo> +- <SignatureValue>+TxC/QCigpQ=</SignatureValue> ++ <SignatureValue>cAAf5NRMJvdO9w==</SignatureValue> + <Object Id="object">some text</Object> + </Signature> +--- tests/aleksey-xmldsig-01/enveloping-sha1-hmac-sha1-64.tmpl ++++ tests/aleksey-xmldsig-01/enveloping-sha1-hmac-sha1-64.tmpl +@@ -3,7 +3,7 @@ + <SignedInfo> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> + <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1"> +- <HMACOutputLength>64</HMACOutputLength> ++ <HMACOutputLength>80</HMACOutputLength> + </SignatureMethod> + <Reference URI="#object"> + <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> +--- tests/aleksey-xmldsig-01/enveloping-sha1-hmac-sha1-64.xml ++++ tests/aleksey-xmldsig-01/enveloping-sha1-hmac-sha1-64.xml +@@ -3,13 +3,13 @@ + <SignedInfo> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> + <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1"> +- <HMACOutputLength>64</HMACOutputLength> ++ <HMACOutputLength>80</HMACOutputLength> + </SignatureMethod> + <Reference URI="#object"> + <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> + <DigestValue>7/XTsHaBSOnJ/jXD5v0zL6VKYsk=</DigestValue> + </Reference> + </SignedInfo> +- <SignatureValue>f/uhIfsfFeg=</SignatureValue> ++ <SignatureValue>xjqFz/yYQRTOrw==</SignatureValue> + <Object Id="object">some text</Object> + </Signature> +--- tests/aleksey-xmldsig-01/enveloping-sha224-hmac-sha224-64.tmpl ++++ tests/aleksey-xmldsig-01/enveloping-sha224-hmac-sha224-64.tmpl +@@ -3,7 +3,7 @@ + <SignedInfo> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> + <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-sha224"> +- <HMACOutputLength>64</HMACOutputLength> ++ <HMACOutputLength>80</HMACOutputLength> + </SignatureMethod> + <Reference URI="#object"> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/> +--- tests/aleksey-xmldsig-01/enveloping-sha224-hmac-sha224-64.xml ++++ tests/aleksey-xmldsig-01/enveloping-sha224-hmac-sha224-64.xml +@@ -3,13 +3,13 @@ + <SignedInfo> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> + <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-sha224"> +- <HMACOutputLength>64</HMACOutputLength> ++ <HMACOutputLength>80</HMACOutputLength> + </SignatureMethod> + <Reference URI="#object"> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/> + <DigestValue>azpKU6mkkPqPdDdtDXlEzVb0Xo2HgZMfuJ8KBw==</DigestValue> + </Reference> + </SignedInfo> +- <SignatureValue>ULeTuYfbvSc=</SignatureValue> ++ <SignatureValue>lZnrOj6ykWj7Zg==</SignatureValue> + <Object Id="object">some text</Object> + </Signature> +--- tests/aleksey-xmldsig-01/enveloping-sha256-hmac-sha256-64.tmpl ++++ tests/aleksey-xmldsig-01/enveloping-sha256-hmac-sha256-64.tmpl +@@ -3,7 +3,7 @@ + <SignedInfo> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> + <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"> +- <HMACOutputLength>64</HMACOutputLength> ++ <HMACOutputLength>80</HMACOutputLength> + </SignatureMethod> + <Reference URI="#object"> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> +--- tests/aleksey-xmldsig-01/enveloping-sha256-hmac-sha256-64.xml ++++ tests/aleksey-xmldsig-01/enveloping-sha256-hmac-sha256-64.xml +@@ -3,13 +3,13 @@ + <SignedInfo> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> + <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"> +- <HMACOutputLength>64</HMACOutputLength> ++ <HMACOutputLength>80</HMACOutputLength> + </SignatureMethod> + <Reference URI="#object"> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> + <DigestValue>iDhYt78o294fA6pzQ7k44+eejrQMi+WX3l3UrUdtL1Q=</DigestValue> + </Reference> + </SignedInfo> +- <SignatureValue>BSM2P+9soOk=</SignatureValue> ++ <SignatureValue>zDqLw++TOXixpw==</SignatureValue> + <Object Id="object">some text</Object> + </Signature> +--- tests/aleksey-xmldsig-01/enveloping-sha384-hmac-sha384-64.tmpl ++++ tests/aleksey-xmldsig-01/enveloping-sha384-hmac-sha384-64.tmpl +@@ -3,7 +3,7 @@ + <SignedInfo> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> + <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-sha384"> +- <HMACOutputLength>64</HMACOutputLength> ++ <HMACOutputLength>80</HMACOutputLength> + </SignatureMethod> + <Reference URI="#object"> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/> +--- tests/aleksey-xmldsig-01/enveloping-sha384-hmac-sha384-64.xml ++++ tests/aleksey-xmldsig-01/enveloping-sha384-hmac-sha384-64.xml +@@ -3,13 +3,13 @@ + <SignedInfo> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> + <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-sha384"> +- <HMACOutputLength>64</HMACOutputLength> ++ <HMACOutputLength>80</HMACOutputLength> + </SignatureMethod> + <Reference URI="#object"> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/> + <DigestValue>uTx8AeqrTmv+nijRsWW7TOs1pCIuCudsFRVloP6hPin8Q4x9fFX2j/zj53XB37OG</DigestValue> + </Reference> + </SignedInfo> +- <SignatureValue>azErzRgKjtM=</SignatureValue> ++ <SignatureValue>ZgeAT9hZEkXlyQ==</SignatureValue> + <Object Id="object">some text</Object> + </Signature> +--- tests/aleksey-xmldsig-01/enveloping-sha512-hmac-sha512-64.tmpl ++++ tests/aleksey-xmldsig-01/enveloping-sha512-hmac-sha512-64.tmpl +@@ -3,7 +3,7 @@ + <SignedInfo> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> + <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-sha512"> +- <HMACOutputLength>64</HMACOutputLength> ++ <HMACOutputLength>80</HMACOutputLength> + </SignatureMethod> + <Reference URI="#object"> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/> +--- tests/aleksey-xmldsig-01/enveloping-sha512-hmac-sha512-64.xml ++++ tests/aleksey-xmldsig-01/enveloping-sha512-hmac-sha512-64.xml +@@ -3,7 +3,7 @@ + <SignedInfo> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> + <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-sha512"> +- <HMACOutputLength>64</HMACOutputLength> ++ <HMACOutputLength>80</HMACOutputLength> + </SignatureMethod> + <Reference URI="#object"> + <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/> +@@ -11,6 +11,6 @@ + XDnbRaf22WqerzX1vL0QzA==</DigestValue> + </Reference> + </SignedInfo> +- <SignatureValue>rQcObPRcpOc=</SignatureValue> ++ <SignatureValue>shktZYjrs58vuA==</SignatureValue> + <Object Id="object">some text</Object> + </Signature> +--- tests/merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40.tmpl ++++ tests/merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40.tmpl +@@ -3,7 +3,7 @@ + <SignedInfo> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> + <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1"> +- <HMACOutputLength>40</HMACOutputLength> ++ <HMACOutputLength>80</HMACOutputLength> + </SignatureMethod> + <Reference URI="#object"> + <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /> +--- tests/merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40.xml ++++ tests/merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40.xml +@@ -3,7 +3,7 @@ + <SignedInfo> + <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> + <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1"> +- <HMACOutputLength>40</HMACOutputLength> ++ <HMACOutputLength>80</HMACOutputLength> + </SignatureMethod> + <Reference URI="#object"> + <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /> +@@ -11,7 +11,7 @@ + </Reference> + </SignedInfo> + <SignatureValue> +- HHiqvCU= ++ xjqFz/yYQRTOrw== + </SignatureValue> + <Object Id="object">some text</Object> + </Signature> +--- tests/phaos-xmldsig-three/signature-hmac-sha1-40-c14n-comments-detached.xml ++++ tests/phaos-xmldsig-three/signature-hmac-sha1-40-c14n-comments-detached.xml +@@ -1 +1 @@ +-<dsig:Signature xmlns="http://www.w3.org/2000/09/xmldsig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1"><dsig:HMACOutputLength>40</dsig:HMACOutputLength></dsig:SignatureMethod><dsig:Reference URI="http://www.ietf.org/rfc/rfc3161.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>eT5ZU9fkIwQ9b9XAYq+iIYnj0DQ=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>D8A3AYM=</dsig:SignatureValue></dsig:Signature> +\ No newline at end of file ++<dsig:Signature xmlns="http://www.w3.org/2000/09/xmldsig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1"><dsig:HMACOutputLength>80</dsig:HMACOutputLength></dsig:SignatureMethod><dsig:Reference URI="http://www.ietf.org/rfc/rfc3161.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>eT5ZU9fkIwQ9b9XAYq+iIYnj0DQ=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>e/Cz41h/IJocTg==</dsig:SignatureValue></dsig:Signature> +\ No newline at end of file +--- tests/phaos-xmldsig-three/signature-hmac-sha1-40-exclusive-c14n-comments-detached.xml ++++ tests/phaos-xmldsig-three/signature-hmac-sha1-40-exclusive-c14n-comments-detached.xml +@@ -1 +1 @@ +-<dsig:Signature xmlns="http://www.w3.org/2000/09/xmldsig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1"><dsig:HMACOutputLength>40</dsig:HMACOutputLength></dsig:SignatureMethod><dsig:Reference URI="http://www.ietf.org/rfc/rfc3161.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>eT5ZU9fkIwQ9b9XAYq+iIYnj0DQ=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>awZmh2c=</dsig:SignatureValue></dsig:Signature> +\ No newline at end of file ++<dsig:Signature xmlns="http://www.w3.org/2000/09/xmldsig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1"><dsig:HMACOutputLength>80</dsig:HMACOutputLength></dsig:SignatureMethod><dsig:Reference URI="http://www.ietf.org/rfc/rfc3161.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>eT5ZU9fkIwQ9b9XAYq+iIYnj0DQ=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>iuQK6TvAjMciIw==</dsig:SignatureValue></dsig:Signature> +\ No newline at end of file diff --git a/dev-libs/xmlsec/xmlsec-1.2.12.ebuild b/dev-libs/xmlsec/xmlsec-1.2.12.ebuild new file mode 100644 index 000000000000..64e4688819fd --- /dev/null +++ b/dev-libs/xmlsec/xmlsec-1.2.12.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/xmlsec-1.2.12.ebuild,v 1.1 2009/07/29 16:37:41 arfrever Exp $ + +EAPI="2" + +inherit autotools eutils flag-o-matic + +DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML" +HOMEPAGE="http://www.aleksey.com/xmlsec" +SRC_URI="http://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="gnutls mozilla ssl" + +RDEPEND=">=dev-libs/libxslt-1.0.20 + ssl? ( >=dev-libs/openssl-0.9.7 ) + gnutls? ( >=net-libs/gnutls-0.8.1 ) + mozilla? ( >=dev-libs/nspr-4.0 + >=dev-libs/nss-3.2 )" +DEPEND="${RDEPEND} + >=dev-libs/libxml2-2.6.12 + dev-util/pkgconfig" + +S="${WORKDIR}/${PN}1-${PV}" + +src_prepare() { + epatch "${FILESDIR}/${P}-min_hmac_size.patch" + epatch "${FILESDIR}/${P}-fix_implicit_declaration.patch" + + sed -i \ + -e '/^XMLSEC_SHLIBSFX=/s/\(XMLSEC_SHLIBSFX=\).*/\1".so"/' \ + -e '/sha1.*pkgconfig/s/sha1/pkgconfig/' \ + -e '/^AC_LIB_LTDL$/d' configure.in || die "sed configure.in failed" + eautoreconf +} + +src_configure() { + append-cppflags '-DLTDL_OBJDIR=\".libs\"' '-DLTDL_SHLIB_EXT=\".so\"' + local myconf + use gnutls || myconf="--without-gnutls" + econf \ + --enable-pkgconfig \ + --enable-xkms \ + $(use_enable ssl aes) \ + $(use_with ssl openssl /usr) \ + --with-html-dir=/usr/share/doc/${PF} \ + ${myconf} +} + +src_test() { + TMPFOLDER="${T}" emake check || die "emake check failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "install failed" + dodoc AUTHORS README NEWS +} |