1 |
arfrever 09/07/29 16:37:41 |
2 |
|
3 |
Added: xmlsec-1.2.12-min_hmac_size.patch |
4 |
xmlsec-1.2.12-fix_implicit_declaration.patch |
5 |
Log: |
6 |
Version bump (bug #277876). |
7 |
(Portage version: 13851-svn/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-libs/xmlsec/files/xmlsec-1.2.12-min_hmac_size.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlsec/files/xmlsec-1.2.12-min_hmac_size.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlsec/files/xmlsec-1.2.12-min_hmac_size.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: xmlsec-1.2.12-min_hmac_size.patch |
16 |
=================================================================== |
17 |
http://git.gnome.org/cgit/xmlsec/commit/?id=c07c1961dc8a08d81dad6c1fd984acd09ae99028 |
18 |
|
19 |
--- src/gnutls/hmac.c |
20 |
+++ src/gnutls/hmac.c |
21 |
@@ -23,8 +23,9 @@ |
22 |
#include <xmlsec/gnutls/app.h> |
23 |
#include <xmlsec/gnutls/crypto.h> |
24 |
|
25 |
-#define XMLSEC_GNUTLS_MIN_HMAC_SIZE 40 |
26 |
-#define XMLSEC_GNUTLS_MAX_HMAC_SIZE 128 |
27 |
+/* sizes in bits */ |
28 |
+#define XMLSEC_GNUTLS_MIN_HMAC_SIZE 80 |
29 |
+#define XMLSEC_GNUTLS_MAX_HMAC_SIZE (128 * 8) |
30 |
|
31 |
/************************************************************************** |
32 |
* |
33 |
@@ -65,7 +66,7 @@ typedef struct _xmlSecGnuTLSHmacCtx xmlSecGnuTLSHmacCtx, *xmlSecGnuTLSHmacCtxPt |
34 |
struct _xmlSecGnuTLSHmacCtx { |
35 |
int digest; |
36 |
GcryMDHd digestCtx; |
37 |
- xmlSecByte dgst[XMLSEC_GNUTLS_MAX_HMAC_SIZE]; |
38 |
+ xmlSecByte dgst[XMLSEC_GNUTLS_MAX_HMAC_SIZE / 8]; |
39 |
xmlSecSize dgstSize; /* dgst size in bits */ |
40 |
}; |
41 |
|
42 |
--- src/nss/hmac.c |
43 |
+++ src/nss/hmac.c |
44 |
@@ -26,8 +26,9 @@ |
45 |
#include <xmlsec/nss/app.h> |
46 |
#include <xmlsec/nss/crypto.h> |
47 |
|
48 |
-#define XMLSEC_NSS_MIN_HMAC_SIZE 40 |
49 |
-#define XMLSEC_NSS_MAX_HMAC_SIZE 128 |
50 |
+/* sizes in bits */ |
51 |
+#define XMLSEC_NSS_MIN_HMAC_SIZE 80 |
52 |
+#define XMLSEC_NSS_MAX_HMAC_SIZE (128 * 8) |
53 |
|
54 |
/************************************************************************** |
55 |
* |
56 |
@@ -68,7 +69,7 @@ typedef struct _xmlSecNssHmacCtx xmlSecNssHmacCtx, *xmlSecNssHmacCtxPtr; |
57 |
struct _xmlSecNssHmacCtx { |
58 |
CK_MECHANISM_TYPE digestType; |
59 |
PK11Context* digestCtx; |
60 |
- xmlSecByte dgst[XMLSEC_NSS_MAX_HMAC_SIZE]; |
61 |
+ xmlSecByte dgst[XMLSEC_NSS_MAX_HMAC_SIZE / 8]; |
62 |
xmlSecSize dgstSize; /* dgst size in bits */ |
63 |
}; |
64 |
|
65 |
--- src/openssl/hmac.c |
66 |
+++ src/openssl/hmac.c |
67 |
@@ -32,7 +32,9 @@ |
68 |
|
69 |
#include <xmlsec/openssl/crypto.h> |
70 |
|
71 |
-#define XMLSEC_OPENSSL_MIN_HMAC_SIZE 40 |
72 |
+/* sizes in bits */ |
73 |
+#define XMLSEC_OPENSSL_MIN_HMAC_SIZE 80 |
74 |
+#define XMLSEC_OPENSSL_MAX_HMAC_SIZE (EVP_MAX_MD_SIZE * 8) |
75 |
|
76 |
/************************************************************************** |
77 |
* |
78 |
@@ -74,7 +76,7 @@ struct _xmlSecOpenSSLHmacCtx { |
79 |
const EVP_MD* hmacDgst; |
80 |
HMAC_CTX hmacCtx; |
81 |
int ctxInitialized; |
82 |
- xmlSecByte dgst[EVP_MAX_MD_SIZE]; |
83 |
+ xmlSecByte dgst[XMLSEC_OPENSSL_MAX_HMAC_SIZE]; |
84 |
xmlSecSize dgstSize; /* dgst size in bits */ |
85 |
}; |
86 |
|
87 |
@@ -380,6 +382,14 @@ xmlSecOpenSSLHmacVerify(xmlSecTransformPtr transform, |
88 |
|
89 |
/* compare the digest size in bytes */ |
90 |
if(dataSize != ((ctx->dgstSize + 7) / 8)){ |
91 |
+ /* NO COMMIT */ |
92 |
+ xmlChar* a; |
93 |
+ mask = last_byte_masks[ctx->dgstSize % 8]; |
94 |
+ ctx->dgst[dataSize - 1] &= mask; |
95 |
+ a = xmlSecBase64Encode(ctx->dgst, (ctx->dgstSize + 7) / 8, -1); |
96 |
+ fprintf(stderr, "%s\n", a); |
97 |
+ xmlFree(a); |
98 |
+ |
99 |
xmlSecError(XMLSEC_ERRORS_HERE, |
100 |
xmlSecErrorsSafeString(xmlSecTransformGetName(transform)), |
101 |
NULL, |
102 |
--- tests/aleksey-xmldsig-01/enveloping-md5-hmac-md5-64.tmpl |
103 |
+++ tests/aleksey-xmldsig-01/enveloping-md5-hmac-md5-64.tmpl |
104 |
@@ -3,7 +3,7 @@ |
105 |
<SignedInfo> |
106 |
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> |
107 |
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-md5"> |
108 |
- <HMACOutputLength>64</HMACOutputLength> |
109 |
+ <HMACOutputLength>80</HMACOutputLength> |
110 |
</SignatureMethod> |
111 |
<Reference URI="#object"> |
112 |
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/> |
113 |
--- tests/aleksey-xmldsig-01/enveloping-md5-hmac-md5-64.xml |
114 |
+++ tests/aleksey-xmldsig-01/enveloping-md5-hmac-md5-64.xml |
115 |
@@ -3,13 +3,13 @@ |
116 |
<SignedInfo> |
117 |
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> |
118 |
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-md5"> |
119 |
- <HMACOutputLength>64</HMACOutputLength> |
120 |
+ <HMACOutputLength>80</HMACOutputLength> |
121 |
</SignatureMethod> |
122 |
<Reference URI="#object"> |
123 |
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/> |
124 |
<DigestValue>/u+47lA0BK55De4qRAg16w==</DigestValue> |
125 |
</Reference> |
126 |
</SignedInfo> |
127 |
- <SignatureValue>j202k+irNYE=</SignatureValue> |
128 |
+ <SignatureValue>8woIGhwIlkw9Gw==</SignatureValue> |
129 |
<Object Id="object">some text</Object> |
130 |
</Signature> |
131 |
--- tests/aleksey-xmldsig-01/enveloping-ripemd160-hmac-ripemd160-64.tmpl |
132 |
+++ tests/aleksey-xmldsig-01/enveloping-ripemd160-hmac-ripemd160-64.tmpl |
133 |
@@ -3,7 +3,7 @@ |
134 |
<SignedInfo> |
135 |
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> |
136 |
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160"> |
137 |
- <HMACOutputLength>64</HMACOutputLength> |
138 |
+ <HMACOutputLength>80</HMACOutputLength> |
139 |
</SignatureMethod> |
140 |
<Reference URI="#object"> |
141 |
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/> |
142 |
--- tests/aleksey-xmldsig-01/enveloping-ripemd160-hmac-ripemd160-64.xml |
143 |
+++ tests/aleksey-xmldsig-01/enveloping-ripemd160-hmac-ripemd160-64.xml |
144 |
@@ -3,13 +3,13 @@ |
145 |
<SignedInfo> |
146 |
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> |
147 |
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160"> |
148 |
- <HMACOutputLength>64</HMACOutputLength> |
149 |
+ <HMACOutputLength>80</HMACOutputLength> |
150 |
</SignatureMethod> |
151 |
<Reference URI="#object"> |
152 |
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/> |
153 |
<DigestValue>Ofs8NqfoXX+r0Cas3GRY2GbzhPo=</DigestValue> |
154 |
</Reference> |
155 |
</SignedInfo> |
156 |
- <SignatureValue>+TxC/QCigpQ=</SignatureValue> |
157 |
+ <SignatureValue>cAAf5NRMJvdO9w==</SignatureValue> |
158 |
<Object Id="object">some text</Object> |
159 |
</Signature> |
160 |
--- tests/aleksey-xmldsig-01/enveloping-sha1-hmac-sha1-64.tmpl |
161 |
+++ tests/aleksey-xmldsig-01/enveloping-sha1-hmac-sha1-64.tmpl |
162 |
@@ -3,7 +3,7 @@ |
163 |
<SignedInfo> |
164 |
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> |
165 |
<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1"> |
166 |
- <HMACOutputLength>64</HMACOutputLength> |
167 |
+ <HMACOutputLength>80</HMACOutputLength> |
168 |
</SignatureMethod> |
169 |
<Reference URI="#object"> |
170 |
<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> |
171 |
--- tests/aleksey-xmldsig-01/enveloping-sha1-hmac-sha1-64.xml |
172 |
+++ tests/aleksey-xmldsig-01/enveloping-sha1-hmac-sha1-64.xml |
173 |
@@ -3,13 +3,13 @@ |
174 |
<SignedInfo> |
175 |
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> |
176 |
<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1"> |
177 |
- <HMACOutputLength>64</HMACOutputLength> |
178 |
+ <HMACOutputLength>80</HMACOutputLength> |
179 |
</SignatureMethod> |
180 |
<Reference URI="#object"> |
181 |
<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> |
182 |
<DigestValue>7/XTsHaBSOnJ/jXD5v0zL6VKYsk=</DigestValue> |
183 |
</Reference> |
184 |
</SignedInfo> |
185 |
- <SignatureValue>f/uhIfsfFeg=</SignatureValue> |
186 |
+ <SignatureValue>xjqFz/yYQRTOrw==</SignatureValue> |
187 |
<Object Id="object">some text</Object> |
188 |
</Signature> |
189 |
--- tests/aleksey-xmldsig-01/enveloping-sha224-hmac-sha224-64.tmpl |
190 |
+++ tests/aleksey-xmldsig-01/enveloping-sha224-hmac-sha224-64.tmpl |
191 |
@@ -3,7 +3,7 @@ |
192 |
<SignedInfo> |
193 |
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> |
194 |
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-sha224"> |
195 |
- <HMACOutputLength>64</HMACOutputLength> |
196 |
+ <HMACOutputLength>80</HMACOutputLength> |
197 |
</SignatureMethod> |
198 |
<Reference URI="#object"> |
199 |
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/> |
200 |
--- tests/aleksey-xmldsig-01/enveloping-sha224-hmac-sha224-64.xml |
201 |
+++ tests/aleksey-xmldsig-01/enveloping-sha224-hmac-sha224-64.xml |
202 |
@@ -3,13 +3,13 @@ |
203 |
<SignedInfo> |
204 |
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> |
205 |
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-sha224"> |
206 |
- <HMACOutputLength>64</HMACOutputLength> |
207 |
+ <HMACOutputLength>80</HMACOutputLength> |
208 |
</SignatureMethod> |
209 |
<Reference URI="#object"> |
210 |
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/> |
211 |
<DigestValue>azpKU6mkkPqPdDdtDXlEzVb0Xo2HgZMfuJ8KBw==</DigestValue> |
212 |
</Reference> |
213 |
</SignedInfo> |
214 |
- <SignatureValue>ULeTuYfbvSc=</SignatureValue> |
215 |
+ <SignatureValue>lZnrOj6ykWj7Zg==</SignatureValue> |
216 |
<Object Id="object">some text</Object> |
217 |
</Signature> |
218 |
--- tests/aleksey-xmldsig-01/enveloping-sha256-hmac-sha256-64.tmpl |
219 |
+++ tests/aleksey-xmldsig-01/enveloping-sha256-hmac-sha256-64.tmpl |
220 |
@@ -3,7 +3,7 @@ |
221 |
<SignedInfo> |
222 |
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> |
223 |
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"> |
224 |
- <HMACOutputLength>64</HMACOutputLength> |
225 |
+ <HMACOutputLength>80</HMACOutputLength> |
226 |
</SignatureMethod> |
227 |
<Reference URI="#object"> |
228 |
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> |
229 |
--- tests/aleksey-xmldsig-01/enveloping-sha256-hmac-sha256-64.xml |
230 |
+++ tests/aleksey-xmldsig-01/enveloping-sha256-hmac-sha256-64.xml |
231 |
@@ -3,13 +3,13 @@ |
232 |
<SignedInfo> |
233 |
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> |
234 |
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"> |
235 |
- <HMACOutputLength>64</HMACOutputLength> |
236 |
+ <HMACOutputLength>80</HMACOutputLength> |
237 |
</SignatureMethod> |
238 |
<Reference URI="#object"> |
239 |
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> |
240 |
<DigestValue>iDhYt78o294fA6pzQ7k44+eejrQMi+WX3l3UrUdtL1Q=</DigestValue> |
241 |
</Reference> |
242 |
</SignedInfo> |
243 |
- <SignatureValue>BSM2P+9soOk=</SignatureValue> |
244 |
+ <SignatureValue>zDqLw++TOXixpw==</SignatureValue> |
245 |
<Object Id="object">some text</Object> |
246 |
</Signature> |
247 |
--- tests/aleksey-xmldsig-01/enveloping-sha384-hmac-sha384-64.tmpl |
248 |
+++ tests/aleksey-xmldsig-01/enveloping-sha384-hmac-sha384-64.tmpl |
249 |
@@ -3,7 +3,7 @@ |
250 |
<SignedInfo> |
251 |
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> |
252 |
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-sha384"> |
253 |
- <HMACOutputLength>64</HMACOutputLength> |
254 |
+ <HMACOutputLength>80</HMACOutputLength> |
255 |
</SignatureMethod> |
256 |
<Reference URI="#object"> |
257 |
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/> |
258 |
--- tests/aleksey-xmldsig-01/enveloping-sha384-hmac-sha384-64.xml |
259 |
+++ tests/aleksey-xmldsig-01/enveloping-sha384-hmac-sha384-64.xml |
260 |
@@ -3,13 +3,13 @@ |
261 |
<SignedInfo> |
262 |
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> |
263 |
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-sha384"> |
264 |
- <HMACOutputLength>64</HMACOutputLength> |
265 |
+ <HMACOutputLength>80</HMACOutputLength> |
266 |
</SignatureMethod> |
267 |
<Reference URI="#object"> |
268 |
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/> |
269 |
<DigestValue>uTx8AeqrTmv+nijRsWW7TOs1pCIuCudsFRVloP6hPin8Q4x9fFX2j/zj53XB37OG</DigestValue> |
270 |
</Reference> |
271 |
</SignedInfo> |
272 |
- <SignatureValue>azErzRgKjtM=</SignatureValue> |
273 |
+ <SignatureValue>ZgeAT9hZEkXlyQ==</SignatureValue> |
274 |
<Object Id="object">some text</Object> |
275 |
</Signature> |
276 |
--- tests/aleksey-xmldsig-01/enveloping-sha512-hmac-sha512-64.tmpl |
277 |
+++ tests/aleksey-xmldsig-01/enveloping-sha512-hmac-sha512-64.tmpl |
278 |
@@ -3,7 +3,7 @@ |
279 |
<SignedInfo> |
280 |
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> |
281 |
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-sha512"> |
282 |
- <HMACOutputLength>64</HMACOutputLength> |
283 |
+ <HMACOutputLength>80</HMACOutputLength> |
284 |
</SignatureMethod> |
285 |
<Reference URI="#object"> |
286 |
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/> |
287 |
--- tests/aleksey-xmldsig-01/enveloping-sha512-hmac-sha512-64.xml |
288 |
+++ tests/aleksey-xmldsig-01/enveloping-sha512-hmac-sha512-64.xml |
289 |
@@ -3,7 +3,7 @@ |
290 |
<SignedInfo> |
291 |
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/> |
292 |
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#hmac-sha512"> |
293 |
- <HMACOutputLength>64</HMACOutputLength> |
294 |
+ <HMACOutputLength>80</HMACOutputLength> |
295 |
</SignatureMethod> |
296 |
<Reference URI="#object"> |
297 |
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/> |
298 |
@@ -11,6 +11,6 @@ |
299 |
XDnbRaf22WqerzX1vL0QzA==</DigestValue> |
300 |
</Reference> |
301 |
</SignedInfo> |
302 |
- <SignatureValue>rQcObPRcpOc=</SignatureValue> |
303 |
+ <SignatureValue>shktZYjrs58vuA==</SignatureValue> |
304 |
<Object Id="object">some text</Object> |
305 |
</Signature> |
306 |
--- tests/merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40.tmpl |
307 |
+++ tests/merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40.tmpl |
308 |
@@ -3,7 +3,7 @@ |
309 |
<SignedInfo> |
310 |
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> |
311 |
<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1"> |
312 |
- <HMACOutputLength>40</HMACOutputLength> |
313 |
+ <HMACOutputLength>80</HMACOutputLength> |
314 |
</SignatureMethod> |
315 |
<Reference URI="#object"> |
316 |
<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /> |
317 |
--- tests/merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40.xml |
318 |
+++ tests/merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40.xml |
319 |
@@ -3,7 +3,7 @@ |
320 |
<SignedInfo> |
321 |
<CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /> |
322 |
<SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1"> |
323 |
- <HMACOutputLength>40</HMACOutputLength> |
324 |
+ <HMACOutputLength>80</HMACOutputLength> |
325 |
</SignatureMethod> |
326 |
<Reference URI="#object"> |
327 |
<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /> |
328 |
@@ -11,7 +11,7 @@ |
329 |
</Reference> |
330 |
</SignedInfo> |
331 |
<SignatureValue> |
332 |
- HHiqvCU= |
333 |
+ xjqFz/yYQRTOrw== |
334 |
</SignatureValue> |
335 |
<Object Id="object">some text</Object> |
336 |
</Signature> |
337 |
--- tests/phaos-xmldsig-three/signature-hmac-sha1-40-c14n-comments-detached.xml |
338 |
+++ tests/phaos-xmldsig-three/signature-hmac-sha1-40-c14n-comments-detached.xml |
339 |
@@ -1 +1 @@ |
340 |
-<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> |
341 |
\ No newline at end of file |
342 |
+<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> |
343 |
\ No newline at end of file |
344 |
--- tests/phaos-xmldsig-three/signature-hmac-sha1-40-exclusive-c14n-comments-detached.xml |
345 |
+++ tests/phaos-xmldsig-three/signature-hmac-sha1-40-exclusive-c14n-comments-detached.xml |
346 |
@@ -1 +1 @@ |
347 |
-<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> |
348 |
\ No newline at end of file |
349 |
+<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> |
350 |
\ No newline at end of file |
351 |
|
352 |
|
353 |
|
354 |
1.1 dev-libs/xmlsec/files/xmlsec-1.2.12-fix_implicit_declaration.patch |
355 |
|
356 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlsec/files/xmlsec-1.2.12-fix_implicit_declaration.patch?rev=1.1&view=markup |
357 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/xmlsec/files/xmlsec-1.2.12-fix_implicit_declaration.patch?rev=1.1&content-type=text/plain |
358 |
|
359 |
Index: xmlsec-1.2.12-fix_implicit_declaration.patch |
360 |
=================================================================== |
361 |
--- src/openssl/hmac.c |
362 |
+++ src/openssl/hmac.c |
363 |
@@ -24,6 +24,7 @@ |
364 |
|
365 |
#include <openssl/hmac.h> |
366 |
|
367 |
+#include <xmlsec/base64.h> |
368 |
#include <xmlsec/xmlsec.h> |
369 |
#include <xmlsec/xmltree.h> |
370 |
#include <xmlsec/keys.h> |