upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-21 15:21:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

unbound-anchor portable with openssl 0.9.7.

Browse source 
git-svn-id: file:///svn/unbound/trunk@2340 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2010-11-09 16:05:02 +00:00
parent 2fe65ab2b5
commit 6976832ffe
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,3 +1,6 @@
9 November 2010: Wouter
- unbound-anchor compiles with openssl 0.9.7.
8 November 2010: Wouter 8 November 2010: Wouter
- release tag 1.4.7. - release tag 1.4.7.
- trunk is version 1.4.8. - trunk is version 1.4.8.

17
smallapp/unbound-anchor.c
View file

@ -1594,18 +1594,27 @@ xml_parse(BIO* xml, time_t now)
static int static int
verify_p7sig(BIO* data, BIO* p7s, STACK_OF(X509)* trust) verify_p7sig(BIO* data, BIO* p7s, STACK_OF(X509)* trust)
{ {
X509_VERIFY_PARAM* param = X509_VERIFY_PARAM_new();
PKCS7* p7; PKCS7* p7;
X509_STORE *store = X509_STORE_new(); X509_STORE *store = X509_STORE_new();
int secure = 0; int secure = 0;
int i; int i;
#ifdef X509_V_FLAG_CHECK_SS_SIGNATURE
X509_VERIFY_PARAM* param = X509_VERIFY_PARAM_new();
if(!param) {
if(verb) printf("out of memory\n");
X509_STORE_free(store);
return 0;
}
#endif
(void)BIO_reset(p7s); (void)BIO_reset(p7s);
(void)BIO_reset(data); (void)BIO_reset(data);
if(!param || !store) { if(!store) {
if(verb) printf("out of memory\n"); if(verb) printf("out of memory\n");
#ifdef X509_V_FLAG_CHECK_SS_SIGNATURE
X509_VERIFY_PARAM_free(param); X509_VERIFY_PARAM_free(param);
#endif
X509_STORE_free(store); X509_STORE_free(store);
return 0; return 0;
} }
@ -1614,7 +1623,9 @@ verify_p7sig(BIO* data, BIO* p7s, STACK_OF(X509)* trust)
p7 = d2i_PKCS7_bio(p7s, NULL); p7 = d2i_PKCS7_bio(p7s, NULL);
if(!p7) { if(!p7) {
if(verb) printf("could not parse p7s signature file\n"); if(verb) printf("could not parse p7s signature file\n");
#ifdef X509_V_FLAG_CHECK_SS_SIGNATURE
X509_VERIFY_PARAM_free(param); X509_VERIFY_PARAM_free(param);
#endif
X509_STORE_free(store); X509_STORE_free(store);
return 0; return 0;
} }
@ -1625,8 +1636,8 @@ verify_p7sig(BIO* data, BIO* p7s, STACK_OF(X509)* trust)
* input is valid */ * input is valid */
#ifdef X509_V_FLAG_CHECK_SS_SIGNATURE #ifdef X509_V_FLAG_CHECK_SS_SIGNATURE
X509_VERIFY_PARAM_set_flags(param, X509_V_FLAG_CHECK_SS_SIGNATURE); X509_VERIFY_PARAM_set_flags(param, X509_V_FLAG_CHECK_SS_SIGNATURE);
#endif
X509_STORE_set1_param(store, param); X509_STORE_set1_param(store, param);
#endif
for(i=0; i<sk_X509_num(trust); i++) { for(i=0; i<sk_X509_num(trust); i++) {
if(!X509_STORE_add_cert(store, sk_X509_value(trust, i))) { if(!X509_STORE_add_cert(store, sk_X509_value(trust, i))) {
if(verb) printf("failed X509_STORE_add_cert\n"); if(verb) printf("failed X509_STORE_add_cert\n");