diff options
Diffstat (limited to 'openssl/trunk/crypto/x509v3')
| -rw-r--r-- | openssl/trunk/crypto/x509v3/ext_dat.h | 2 | ||||
| -rw-r--r-- | openssl/trunk/crypto/x509v3/v3_addr.c | 4 | ||||
| -rw-r--r-- | openssl/trunk/crypto/x509v3/v3_asid.c | 4 | ||||
| -rw-r--r-- | openssl/trunk/crypto/x509v3/v3_purp.c | 4 | ||||
| -rw-r--r-- | openssl/trunk/crypto/x509v3/x509v3.h | 12 |
5 files changed, 16 insertions, 10 deletions
diff --git a/openssl/trunk/crypto/x509v3/ext_dat.h b/openssl/trunk/crypto/x509v3/ext_dat.h index 3cf3d3e6..07464f53 100644 --- a/openssl/trunk/crypto/x509v3/ext_dat.h +++ b/openssl/trunk/crypto/x509v3/ext_dat.h @@ -100,8 +100,10 @@ static X509V3_EXT_METHOD *standard_exts[] = { #endif &v3_sxnet, &v3_info, +#ifdef OPENSSL_RFC3779 &v3_addr, &v3_asid, +#endif #ifndef OPENSSL_NO_OCSP &v3_ocsp_nonce, &v3_ocsp_crlid, diff --git a/openssl/trunk/crypto/x509v3/v3_addr.c b/openssl/trunk/crypto/x509v3/v3_addr.c index 78f60ed4..fa8d42ab 100644 --- a/openssl/trunk/crypto/x509v3/v3_addr.c +++ b/openssl/trunk/crypto/x509v3/v3_addr.c @@ -29,6 +29,8 @@ #include <openssl/asn1t.h> #include <openssl/x509v3.h> +#ifdef OPENSSL_RFC3779 + /* * OpenSSL ASN.1 template translation of RFC 3779 2.2.3. */ @@ -1212,3 +1214,5 @@ int v3_addr_validate_resource_set(STACK_OF(X509) *chain, return 0; return v3_addr_validate_path_internal(NULL, chain, ext); } + +#endif /* OPENSSL_RFC3779 */ diff --git a/openssl/trunk/crypto/x509v3/v3_asid.c b/openssl/trunk/crypto/x509v3/v3_asid.c index 70bd5581..180407b1 100644 --- a/openssl/trunk/crypto/x509v3/v3_asid.c +++ b/openssl/trunk/crypto/x509v3/v3_asid.c @@ -31,6 +31,8 @@ #include <openssl/x509.h> #include <openssl/bn.h> +#ifdef OPENSSL_RFC3779 + /* * OpenSSL ASN.1 template translation of RFC 3779 3.2.3. */ @@ -776,3 +778,5 @@ int v3_asid_validate_resource_set(STACK_OF(X509) *chain, return 0; return v3_asid_validate_path_internal(NULL, chain, ext); } + +#endif /* OPENSSL_RFC3779 */ diff --git a/openssl/trunk/crypto/x509v3/v3_purp.c b/openssl/trunk/crypto/x509v3/v3_purp.c index 5ad2047e..717c2f3b 100644 --- a/openssl/trunk/crypto/x509v3/v3_purp.c +++ b/openssl/trunk/crypto/x509v3/v3_purp.c @@ -287,8 +287,10 @@ int X509_supported_extension(X509_EXTENSION *ex) NID_basic_constraints, /* 87 */ NID_certificate_policies, /* 89 */ NID_ext_key_usage, /* 126 */ +#ifdef OPENSSL_RFC3779 NID_sbgp_ipAddrBlock, /* 290 */ NID_sbgp_autonomousSysNum, /* 291 */ +#endif NID_proxyCertInfo /* 661 */ }; @@ -413,9 +415,11 @@ static void x509v3_cache_extensions(X509 *x) } x->skid =X509_get_ext_d2i(x, NID_subject_key_identifier, NULL, NULL); x->akid =X509_get_ext_d2i(x, NID_authority_key_identifier, NULL, NULL); +#ifdef OPENSSL_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); diff --git a/openssl/trunk/crypto/x509v3/x509v3.h b/openssl/trunk/crypto/x509v3/x509v3.h index fc0570b2..289fbc27 100644 --- a/openssl/trunk/crypto/x509v3/x509v3.h +++ b/openssl/trunk/crypto/x509v3/x509v3.h @@ -626,13 +626,7 @@ int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE)*dn_sk, void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent); -/* - * [sra] Begin RFC 3779 stuff - * - * The following definitions and declarations will need to be merged - * into the the rest of this file more cleanly. Right now they're - * organized as a unit to make it easier to see what I've added. - */ +#ifdef OPENSSL_RFC3779 typedef struct ASRange_st { ASN1_INTEGER *min, *max; @@ -753,9 +747,7 @@ int v3_addr_validate_resource_set(STACK_OF(X509) *chain, IPAddrBlocks *ext, int allow_inheritance); -/* - * [sra] End RFC 3779 stuff - */ +#endif /* OPENSSL_RFC3779 */ /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes |