aboutsummaryrefslogtreecommitdiff
path: root/crypto/asn1/x_x509.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2015-01-27 10:19:14 -0500
committerRich Salz <rsalz@openssl.org>2015-01-27 10:19:14 -0500
commitc73ad690174171b63a53dabdb2f2d9ebfd30053a (patch)
treee627ce5a98f6aeecfc985295f1a1a853fe91fc06 /crypto/asn1/x_x509.c
parenta00ae6c46e0d7907a7c9f9e85334e968aa5fd338 (diff)
downloadopenssl-c73ad690174171b63a53dabdb2f2d9ebfd30053a.zip
openssl-c73ad690174171b63a53dabdb2f2d9ebfd30053a.tar.gz
openssl-c73ad690174171b63a53dabdb2f2d9ebfd30053a.tar.bz2
OPENSSL_NO_xxx cleanup: RFC3779
Remove OPENSSL_NO_RFCF3779. Also, makevms.com was ignored by some of the other cleanups, so I caught it up. Sorry I ignored you, poor little VMS... Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/asn1/x_x509.c')
-rw-r--r--crypto/asn1/x_x509.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index cd838e0..f487dbb 100644
--- a/crypto/asn1/x_x509.c
+++ b/crypto/asn1/x_x509.c
@@ -95,10 +95,8 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
ret->ex_pathlen = -1;
ret->skid = NULL;
ret->akid = NULL;
-#ifndef OPENSSL_NO_RFC3779
ret->rfc3779_addr = NULL;
ret->rfc3779_asid = NULL;
-#endif
ret->aux = NULL;
ret->crldp = NULL;
CRYPTO_new_ex_data(CRYPTO_EX_INDEX_X509, ret, &ret->ex_data);
@@ -119,10 +117,8 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
policy_cache_free(ret->policy_cache);
GENERAL_NAMES_free(ret->altname);
NAME_CONSTRAINTS_free(ret->nc);
-#ifndef OPENSSL_NO_RFC3779
sk_IPAddressFamily_pop_free(ret->rfc3779_addr, IPAddressFamily_free);
ASIdentifiers_free(ret->rfc3779_asid);
-#endif
if (ret->name != NULL)
OPENSSL_free(ret->name);