diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c index b6110d2d60..a3cae2c128 100644 --- a/crypto/asn1/x_x509.c +++ b/crypto/asn1/x_x509.c @@ -95,7 +95,7 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, ret->ex_pathlen = -1; ret->skid = NULL; ret->akid = NULL; -#ifdef OPENSSL_RFC3779 +#ifndef OPENSSL_NO_RFC3779 ret->rfc3779_addr = NULL; ret->rfc3779_asid = NULL; #endif @@ -116,7 +116,7 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, AUTHORITY_KEYID_free(ret->akid); CRL_DIST_POINTS_free(ret->crldp); policy_cache_free(ret->policy_cache); -#ifdef OPENSSL_RFC3779 +#ifndef OPENSSL_NO_RFC3779 sk_IPAddressFamily_pop_free(ret->rfc3779_addr, IPAddressFamily_free); ASIdentifiers_free(ret->rfc3779_asid); #endif diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h index 575745e235..5da6d9a16f 100644 --- a/crypto/stack/safestack.h +++ b/crypto/stack/safestack.h @@ -297,7 +297,6 @@ STACK_OF(type) \ #define sk_ACCESS_DESCRIPTION_sort(st) SKM_sk_sort(ACCESS_DESCRIPTION, (st)) #define sk_ACCESS_DESCRIPTION_is_sorted(st) SKM_sk_is_sorted(ACCESS_DESCRIPTION, (st)) -#ifdef OPENSSL_RFC3779 #define sk_ASIdOrRange_new(st) SKM_sk_new(ASIdOrRange, (st)) #define sk_ASIdOrRange_new_null() SKM_sk_new_null(ASIdOrRange) #define sk_ASIdOrRange_free(st) SKM_sk_free(ASIdOrRange, (st)) @@ -319,7 +318,6 @@ STACK_OF(type) \ #define sk_ASIdOrRange_pop(st) SKM_sk_pop(ASIdOrRange, (st)) #define sk_ASIdOrRange_sort(st) SKM_sk_sort(ASIdOrRange, (st)) #define sk_ASIdOrRange_is_sorted(st) SKM_sk_is_sorted(ASIdOrRange, (st)) -#endif /* def OPENSSL_RFC3779 */ #define sk_ASN1_GENERALSTRING_new(st) SKM_sk_new(ASN1_GENERALSTRING, (st)) #define sk_ASN1_GENERALSTRING_new_null() SKM_sk_new_null(ASN1_GENERALSTRING) @@ -805,7 +803,7 @@ STACK_OF(type) \ #define sk_GENERAL_SUBTREE_sort(st) SKM_sk_sort(GENERAL_SUBTREE, (st)) #define sk_GENERAL_SUBTREE_is_sorted(st) SKM_sk_is_sorted(GENERAL_SUBTREE, (st)) -#ifdef OPENSSL_RFC3779 +#ifndef OPENSSL_NO_RFC3779 #define sk_IPAddressFamily_new(st) SKM_sk_new(IPAddressFamily, (st)) #define sk_IPAddressFamily_new_null() SKM_sk_new_null(IPAddressFamily) #define sk_IPAddressFamily_free(st) SKM_sk_free(IPAddressFamily, (st)) @@ -849,7 +847,7 @@ STACK_OF(type) \ #define sk_IPAddressOrRange_pop(st) SKM_sk_pop(IPAddressOrRange, (st)) #define sk_IPAddressOrRange_sort(st) SKM_sk_sort(IPAddressOrRange, (st)) #define sk_IPAddressOrRange_is_sorted(st) SKM_sk_is_sorted(IPAddressOrRange, (st)) -#endif /* def OPENSSL_RFC3779 */ +#endif /* OPENSSL_NO_RFC3779 */ #define sk_KRB5_APREQBODY_new(st) SKM_sk_new(KRB5_APREQBODY, (st)) #define sk_KRB5_APREQBODY_new_null() SKM_sk_new_null(KRB5_APREQBODY) diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h index b70a008b85..4cc55b8f51 100644 --- a/crypto/x509/x509.h +++ b/crypto/x509/x509.h @@ -291,7 +291,7 @@ struct x509_st AUTHORITY_KEYID *akid; X509_POLICY_CACHE *policy_cache; STACK_OF(DIST_POINT) *crldp; -#ifdef OPENSSL_RFC3779 +#ifndef OPENSSL_NO_RFC3779 STACK_OF(IPAddressFamily) *rfc3779_addr; struct ASIdentifiers_st *rfc3779_asid; #endif diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index d58f90010b..28cdb6b721 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -314,7 +314,7 @@ int X509_verify_cert(X509_STORE_CTX *ctx) ok=internal_verify(ctx); if(!ok) goto end; -#ifdef OPENSSL_RFC3779 +#ifndef OPENSSL_NO_RFC3779 /* RFC 3779 path validation, now that CRL check has been done */ ok = v3_asid_validate_path(ctx); if (!ok) goto end; diff --git a/crypto/x509v3/ext_dat.h b/crypto/x509v3/ext_dat.h index d1e3c99b4b..1c94bffc8f 100644 --- a/crypto/x509v3/ext_dat.h +++ b/crypto/x509v3/ext_dat.h @@ -100,7 +100,7 @@ static X509V3_EXT_METHOD *standard_exts[] = { #endif &v3_sxnet, &v3_info, -#ifdef OPENSSL_RFC3779 +#ifndef OPENSSL_NO_RFC3779 &v3_addr, &v3_asid, #endif diff --git a/crypto/x509v3/v3_addr.c b/crypto/x509v3/v3_addr.c index 4a794ae111..9580896096 100644 --- a/crypto/x509v3/v3_addr.c +++ b/crypto/x509v3/v3_addr.c @@ -1277,4 +1277,4 @@ int v3_addr_validate_resource_set(STACK_OF(X509) *chain, return v3_addr_validate_path_internal(NULL, chain, ext); } -#endif /* OPENSSL_RFC3779 */ +#endif /* OPENSSL_NO_RFC3779 */ diff --git a/crypto/x509v3/v3_asid.c b/crypto/x509v3/v3_asid.c index 68e7661031..f155c1f438 100644 --- a/crypto/x509v3/v3_asid.c +++ b/crypto/x509v3/v3_asid.c @@ -70,7 +70,7 @@ #include #include -#ifdef OPENSSL_RFC3779 +#ifndef OPENSSL_NO_RFC3779 /* * OpenSSL ASN.1 template translation of RFC 3779 3.2.3. @@ -841,4 +841,4 @@ int v3_asid_validate_resource_set(STACK_OF(X509) *chain, return v3_asid_validate_path_internal(NULL, chain, ext); } -#endif /* OPENSSL_RFC3779 */ +#endif /* OPENSSL_NO_RFC3779 */ diff --git a/crypto/x509v3/v3_purp.c b/crypto/x509v3/v3_purp.c index 9d0dd70aea..2161b6f1d8 100644 --- a/crypto/x509v3/v3_purp.c +++ b/crypto/x509v3/v3_purp.c @@ -289,7 +289,7 @@ int X509_supported_extension(X509_EXTENSION *ex) NID_basic_constraints, /* 87 */ NID_certificate_policies, /* 89 */ NID_ext_key_usage, /* 126 */ -#ifdef OPENSSL_RFC3779 +#ifndef OPENSSL_NO_RFC3779 NID_sbgp_ipAddrBlock, /* 290 */ NID_sbgp_autonomousSysNum, /* 291 */ #endif @@ -418,7 +418,7 @@ 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); x->crldp = X509_get_ext_d2i(x, NID_crl_distribution_points, NULL, NULL); -#ifdef OPENSSL_RFC3779 +#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); diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h index 2238df24ea..4881d67601 100644 --- a/crypto/x509v3/x509v3.h +++ b/crypto/x509v3/x509v3.h @@ -805,7 +805,7 @@ int v3_addr_validate_resource_set(STACK_OF(X509) *chain, IPAddrBlocks *ext, int allow_inheritance); -#endif /* OPENSSL_RFC3779 */ +#endif /* OPENSSL_NO_RFC3779 */ /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes