diff options
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_purp.c')
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_purp.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_purp.c b/src/lib/libcrypto/x509v3/v3_purp.c index d1e888482e..69a8d05f26 100644 --- a/src/lib/libcrypto/x509v3/v3_purp.c +++ b/src/lib/libcrypto/x509v3/v3_purp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_purp.c,v 1.25 2015/02/10 11:22:22 jsing Exp $ */ | 1 | /* $OpenBSD: v3_purp.c,v 1.26 2015/02/10 13:28:17 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
@@ -346,10 +346,6 @@ X509_supported_extension(X509_EXTENSION *ex) | |||
346 | NID_basic_constraints, /* 87 */ | 346 | NID_basic_constraints, /* 87 */ |
347 | NID_certificate_policies, /* 89 */ | 347 | NID_certificate_policies, /* 89 */ |
348 | NID_ext_key_usage, /* 126 */ | 348 | NID_ext_key_usage, /* 126 */ |
349 | #ifndef OPENSSL_NO_RFC3779 | ||
350 | NID_sbgp_ipAddrBlock, /* 290 */ | ||
351 | NID_sbgp_autonomousSysNum, /* 291 */ | ||
352 | #endif | ||
353 | NID_policy_constraints, /* 401 */ | 349 | NID_policy_constraints, /* 401 */ |
354 | NID_proxyCertInfo, /* 663 */ | 350 | NID_proxyCertInfo, /* 663 */ |
355 | NID_name_constraints, /* 666 */ | 351 | NID_name_constraints, /* 666 */ |
@@ -531,11 +527,6 @@ x509v3_cache_extensions(X509 *x) | |||
531 | x->ex_flags |= EXFLAG_INVALID; | 527 | x->ex_flags |= EXFLAG_INVALID; |
532 | setup_crldp(x); | 528 | setup_crldp(x); |
533 | 529 | ||
534 | #ifndef OPENSSL_NO_RFC3779 | ||
535 | x->rfc3779_addr = X509_get_ext_d2i(x, NID_sbgp_ipAddrBlock, NULL, NULL); | ||
536 | x->rfc3779_asid = X509_get_ext_d2i(x, NID_sbgp_autonomousSysNum, | ||
537 | NULL, NULL); | ||
538 | #endif | ||
539 | for (i = 0; i < X509_get_ext_count(x); i++) { | 530 | for (i = 0; i < X509_get_ext_count(x); i++) { |
540 | ex = X509_get_ext(x, i); | 531 | ex = X509_get_ext(x, i); |
541 | if (OBJ_obj2nid(X509_EXTENSION_get_object(ex)) == | 532 | if (OBJ_obj2nid(X509_EXTENSION_get_object(ex)) == |