From: tb <tb@openbsd.org>
Date: Wed, 1 Nov 2023 20:19:16 +0000 (+0000)
Subject: Split X509_ALGOR_set0_parameter() out of X509_ALGOR_set0()
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=75f7ef760b470e500cad298258178f686b7e27be;p=openbsd

Split X509_ALGOR_set0_parameter() out of X509_ALGOR_set0()

ok jsing
---

diff --git a/lib/libcrypto/asn1/x_algor.c b/lib/libcrypto/asn1/x_algor.c
index d91efe93237..869625036af 100644
--- a/lib/libcrypto/asn1/x_algor.c
+++ b/lib/libcrypto/asn1/x_algor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_algor.c,v 1.32 2023/11/01 20:14:51 tb Exp $ */
+/* $OpenBSD: x_algor.c,v 1.33 2023/11/01 20:19:16 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -158,12 +158,9 @@ X509_ALGOR_set0_obj(X509_ALGOR *alg, ASN1_OBJECT *aobj)
 	return 1;
 }
 
-int
-X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval)
+static int
+X509_ALGOR_set0_parameter(X509_ALGOR *alg, int ptype, void *pval)
 {
-	if (alg == NULL)
-		return 0;
-
 	if (ptype == V_ASN1_UNDEF) {
 		ASN1_TYPE_free(alg->parameter);
 		alg->parameter = NULL;
@@ -176,6 +173,18 @@ X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval)
 			ASN1_TYPE_set(alg->parameter, ptype, pval);
 	}
 
+	return 1;
+}
+
+int
+X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval)
+{
+	if (alg == NULL)
+		return 0;
+
+	if (!X509_ALGOR_set0_parameter(alg, ptype, pval))
+		return 0;
+
 	if (!X509_ALGOR_set0_obj(alg, aobj))
 		return 0;