unifdef OPENSSL_NO_RFC3779 - this is currently disabled and unlikely to

be enabled, mostly since people use SANs instead.

ok beck@ guenther@

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 @@
-/* $OpenBSD: v3_purp.c,v 1.25 2015/02/10 11:22:22 jsing Exp $ */
+/* $OpenBSD: v3_purp.c,v 1.26 2015/02/10 13:28:17 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -346,10 +346,6 @@ X509_supported_extension(X509_EXTENSION *ex)
                 NID_basic_constraints,  /* 87 */
                 NID_certificate_policies, /* 89 */
                 NID_ext_key_usage,      /* 126 */
-#ifndef OPENSSL_NO_RFC3779
-                NID_sbgp_ipAddrBlock,   /* 290 */
-                NID_sbgp_autonomousSysNum, /* 291 */
-#endif
                 NID_policy_constraints, /* 401 */
                 NID_proxyCertInfo,      /* 663 */
                 NID_name_constraints,   /* 666 */
@@ -531,11 +527,6 @@ x509v3_cache_extensions(X509 *x)
                 x->ex_flags |= EXFLAG_INVALID;
         setup_crldp(x);
 
-#ifndef OPENSSL_NO_RFC3779
-        x->rfc3779_addr = X509_get_ext_d2i(x, NID_sbgp_ipAddrBlock, NULL, NULL);
-        x->rfc3779_asid = X509_get_ext_d2i(x, NID_sbgp_autonomousSysNum,
-            NULL, NULL);
-#endif
         for (i = 0; i < X509_get_ext_count(x); i++) {
                 ex = X509_get_ext(x, i);
                 if (OBJ_obj2nid(X509_EXTENSION_get_object(ex)) ==