diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/x_x509.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/x_x509.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/libcrypto/asn1/x_x509.c b/src/lib/libcrypto/asn1/x_x509.c index 77ec8c41cf..756848fe19 100644 --- a/src/lib/libcrypto/asn1/x_x509.c +++ b/src/lib/libcrypto/asn1/x_x509.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x_x509.c,v 1.20 2015/02/10 05:25:45 jsing Exp $ */ | 1 | /* $OpenBSD: x_x509.c,v 1.21 2015/02/10 13:28:17 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -121,10 +121,6 @@ x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg) | |||
| 121 | ret->ex_pathlen = -1; | 121 | ret->ex_pathlen = -1; |
| 122 | ret->skid = NULL; | 122 | ret->skid = NULL; |
| 123 | ret->akid = NULL; | 123 | ret->akid = NULL; |
| 124 | #ifndef OPENSSL_NO_RFC3779 | ||
| 125 | ret->rfc3779_addr = NULL; | ||
| 126 | ret->rfc3779_asid = NULL; | ||
| 127 | #endif | ||
| 128 | ret->aux = NULL; | 124 | ret->aux = NULL; |
| 129 | ret->crldp = NULL; | 125 | ret->crldp = NULL; |
| 130 | CRYPTO_new_ex_data(CRYPTO_EX_INDEX_X509, ret, &ret->ex_data); | 126 | CRYPTO_new_ex_data(CRYPTO_EX_INDEX_X509, ret, &ret->ex_data); |
| @@ -144,10 +140,6 @@ x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg) | |||
| 144 | policy_cache_free(ret->policy_cache); | 140 | policy_cache_free(ret->policy_cache); |
| 145 | GENERAL_NAMES_free(ret->altname); | 141 | GENERAL_NAMES_free(ret->altname); |
| 146 | NAME_CONSTRAINTS_free(ret->nc); | 142 | NAME_CONSTRAINTS_free(ret->nc); |
| 147 | #ifndef OPENSSL_NO_RFC3779 | ||
| 148 | sk_IPAddressFamily_pop_free(ret->rfc3779_addr, IPAddressFamily_free); | ||
| 149 | ASIdentifiers_free(ret->rfc3779_asid); | ||
| 150 | #endif | ||
| 151 | free(ret->name); | 143 | free(ret->name); |
| 152 | ret->name = NULL; | 144 | ret->name = NULL; |
| 153 | break; | 145 | break; |
