diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2015-07-23 17:30:06 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-09-03 16:31:09 -0400 |
| commit | 47bbaa5b607f592009ed40f5678fde21c10a873c (patch) | |
| tree | f245330f58ec496813a01925af52f9f78e1152df /crypto/asn1/x_x509.c | |
| parent | 64b25758edca688a30f02c260262150f7ad0bc7d (diff) | |
| download | openssl-47bbaa5b607f592009ed40f5678fde21c10a873c.zip openssl-47bbaa5b607f592009ed40f5678fde21c10a873c.tar.gz openssl-47bbaa5b607f592009ed40f5678fde21c10a873c.tar.bz2 | |
Revert "OPENSSL_NO_xxx cleanup: RFC3779"
This reverts the non-cleanup parts of commit c73ad69017. We do actually
have a reasonable use case for OPENSSL_NO_RFC3779 in the EDK2 UEFI
build, since we don't have a strspn() function in our runtime environment
and we don't want the RFC3779 functionality anyway.
In addition, it changes the default behaviour of the Configure script so
that RFC3779 support isn't disabled by default. It was always disabled
from when it was first added in 2006, right up until the point where
OPENSSL_NO_RFC3779 was turned into a no-op, and the code in the
Configure script was left *trying* to disable it, but not actually
working.
Signed-off-by: Rich Salz <rsalz@akamai.com>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/asn1/x_x509.c')
| -rw-r--r-- | crypto/asn1/x_x509.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c index 17bbb91..6e7850c 100644 --- a/crypto/asn1/x_x509.c +++ b/crypto/asn1/x_x509.c @@ -95,8 +95,10 @@ 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); @@ -116,8 +118,10 @@ 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 OPENSSL_free(ret->name); break; |