summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2023-12-14 18:31:03 +0000
committertb <>2023-12-14 18:31:03 +0000
commit79fcd99fd8b7a37447848a9accc221c7f9108e67 (patch)
treec0eada8b9d16e21005eb465703749717a53da7af /src
parent1b9b50d5f8ba7c028f764f555c3912d0c70dfe17 (diff)
downloadopenbsd-79fcd99fd8b7a37447848a9accc221c7f9108e67.tar.gz
openbsd-79fcd99fd8b7a37447848a9accc221c7f9108e67.tar.bz2
openbsd-79fcd99fd8b7a37447848a9accc221c7f9108e67.zip
OBJ_create: use a nid variable to avoid nested function call
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/objects/obj_dat.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c
index 93c6e12cd3..eaa53509eb 100644
--- a/src/lib/libcrypto/objects/obj_dat.c
+++ b/src/lib/libcrypto/objects/obj_dat.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: obj_dat.c,v 1.78 2023/12/14 18:16:13 tb Exp $ */ 1/* $OpenBSD: obj_dat.c,v 1.79 2023/12/14 18:31:03 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 *
@@ -591,7 +591,7 @@ OBJ_create(const char *oid, const char *sn, const char *ln)
591{ 591{
592 ASN1_OBJECT *op = NULL; 592 ASN1_OBJECT *op = NULL;
593 unsigned char *buf = NULL; 593 unsigned char *buf = NULL;
594 int len; 594 int len, nid;
595 int ret = 0; 595 int ret = 0;
596 596
597 if ((len = a2d_ASN1_OBJECT(NULL, 0, oid, -1)) <= 0) 597 if ((len = a2d_ASN1_OBJECT(NULL, 0, oid, -1)) <= 0)
@@ -605,7 +605,8 @@ OBJ_create(const char *oid, const char *sn, const char *ln)
605 if ((len = a2d_ASN1_OBJECT(buf, len, oid, -1)) == 0) 605 if ((len = a2d_ASN1_OBJECT(buf, len, oid, -1)) == 0)
606 goto err; 606 goto err;
607 607
608 if ((op = ASN1_OBJECT_create(OBJ_new_nid(1), buf, len, sn, ln)) == NULL) 608 nid = OBJ_new_nid(1);
609 if ((op = ASN1_OBJECT_create(nid, buf, len, sn, ln)) == NULL)
609 goto err; 610 goto err;
610 611
611 ret = OBJ_add_object(op); 612 ret = OBJ_add_object(op);