summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/x509/x509_conf.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libcrypto/x509/x509_conf.c b/src/lib/libcrypto/x509/x509_conf.c
index a9e5076dc9..b506d3ddfb 100644
--- a/src/lib/libcrypto/x509/x509_conf.c
+++ b/src/lib/libcrypto/x509/x509_conf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_conf.c,v 1.17 2024/06/18 09:47:03 tb Exp $ */ 1/* $OpenBSD: x509_conf.c,v 1.18 2024/06/24 06:32:04 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 1999. 3 * project 1999.
4 */ 4 */
@@ -198,32 +198,32 @@ do_ext_i2d(const X509V3_EXT_METHOD *method, int nid, int crit,
198 ext_der = NULL; 198 ext_der = NULL;
199 ext_len = ASN1_item_i2d(ext_struct, &ext_der, method->it); 199 ext_len = ASN1_item_i2d(ext_struct, &ext_der, method->it);
200 if (ext_len < 0) 200 if (ext_len < 0)
201 goto merr; 201 goto err;
202 } else { 202 } else {
203 unsigned char *p; 203 unsigned char *p;
204 204
205 if ((ext_len = method->i2d(ext_struct, NULL)) <= 0) 205 if ((ext_len = method->i2d(ext_struct, NULL)) <= 0)
206 goto merr; 206 goto err;
207 if ((ext_der = calloc(1, ext_len)) == NULL) 207 if ((ext_der = calloc(1, ext_len)) == NULL)
208 goto merr; 208 goto err;
209 p = ext_der; 209 p = ext_der;
210 if (method->i2d(ext_struct, &p) != ext_len) 210 if (method->i2d(ext_struct, &p) != ext_len)
211 goto merr; 211 goto err;
212 } 212 }
213 if ((ext_oct = ASN1_OCTET_STRING_new()) == NULL) 213 if ((ext_oct = ASN1_OCTET_STRING_new()) == NULL)
214 goto merr; 214 goto err;
215 ASN1_STRING_set0(ext_oct, ext_der, ext_len); 215 ASN1_STRING_set0(ext_oct, ext_der, ext_len);
216 ext_der = NULL; 216 ext_der = NULL;
217 ext_len = 0; 217 ext_len = 0;
218 218
219 ext = X509_EXTENSION_create_by_NID(NULL, nid, crit, ext_oct); 219 ext = X509_EXTENSION_create_by_NID(NULL, nid, crit, ext_oct);
220 if (ext == NULL) 220 if (ext == NULL)
221 goto merr; 221 goto err;
222 ASN1_OCTET_STRING_free(ext_oct); 222 ASN1_OCTET_STRING_free(ext_oct);
223 223
224 return ext; 224 return ext;
225 225
226 merr: 226 err:
227 free(ext_der); 227 free(ext_der);
228 ASN1_OCTET_STRING_free(ext_oct); 228 ASN1_OCTET_STRING_free(ext_oct);
229 X509V3error(ERR_R_MALLOC_FAILURE); 229 X509V3error(ERR_R_MALLOC_FAILURE);