summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libcrypto/asn1/x_x509.c10
-rw-r--r--src/lib/libcrypto/x509/x509_local.h3
2 files changed, 2 insertions, 11 deletions
diff --git a/src/lib/libcrypto/asn1/x_x509.c b/src/lib/libcrypto/asn1/x_x509.c
index 15af015af1..069d84926f 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.40 2025/02/20 20:30:12 tb Exp $ */ 1/* $OpenBSD: x_x509.c,v 1.41 2025/02/21 05:44:28 tb 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 *
@@ -182,7 +182,6 @@ x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
182 switch (operation) { 182 switch (operation) {
183 183
184 case ASN1_OP_NEW_POST: 184 case ASN1_OP_NEW_POST:
185 ret->name = NULL;
186 ret->ex_flags = 0; 185 ret->ex_flags = 0;
187 ret->ex_pathlen = -1; 186 ret->ex_pathlen = -1;
188 ret->skid = NULL; 187 ret->skid = NULL;
@@ -196,11 +195,6 @@ x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
196 CRYPTO_new_ex_data(CRYPTO_EX_INDEX_X509, ret, &ret->ex_data); 195 CRYPTO_new_ex_data(CRYPTO_EX_INDEX_X509, ret, &ret->ex_data);
197 break; 196 break;
198 197
199 case ASN1_OP_D2I_POST:
200 free(ret->name);
201 ret->name = X509_NAME_oneline(ret->cert_info->subject, NULL, 0);
202 break;
203
204 case ASN1_OP_FREE_POST: 198 case ASN1_OP_FREE_POST:
205 CRYPTO_free_ex_data(CRYPTO_EX_INDEX_X509, ret, &ret->ex_data); 199 CRYPTO_free_ex_data(CRYPTO_EX_INDEX_X509, ret, &ret->ex_data);
206 X509_CERT_AUX_free(ret->aux); 200 X509_CERT_AUX_free(ret->aux);
@@ -213,8 +207,6 @@ x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
213 sk_IPAddressFamily_pop_free(ret->rfc3779_addr, IPAddressFamily_free); 207 sk_IPAddressFamily_pop_free(ret->rfc3779_addr, IPAddressFamily_free);
214 ASIdentifiers_free(ret->rfc3779_asid); 208 ASIdentifiers_free(ret->rfc3779_asid);
215#endif 209#endif
216 free(ret->name);
217 ret->name = NULL;
218 break; 210 break;
219 } 211 }
220 212
diff --git a/src/lib/libcrypto/x509/x509_local.h b/src/lib/libcrypto/x509/x509_local.h
index 47fc783db4..09092f7fdc 100644
--- a/src/lib/libcrypto/x509/x509_local.h
+++ b/src/lib/libcrypto/x509/x509_local.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_local.h,v 1.35 2025/02/20 20:30:12 tb Exp $ */ 1/* $OpenBSD: x509_local.h,v 1.36 2025/02/21 05:44:28 tb Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2013. 3 * project 2013.
4 */ 4 */
@@ -185,7 +185,6 @@ struct x509_st {
185 X509_ALGOR *sig_alg; 185 X509_ALGOR *sig_alg;
186 ASN1_BIT_STRING *signature; 186 ASN1_BIT_STRING *signature;
187 int references; 187 int references;
188 char *name;
189 CRYPTO_EX_DATA ex_data; 188 CRYPTO_EX_DATA ex_data;
190 /* These contain copies of various extension values */ 189 /* These contain copies of various extension values */
191 long ex_pathlen; 190 long ex_pathlen;