From dc6fcfdcb9df6cfcb47f1f492ab34de3f94caa46 Mon Sep 17 00:00:00 2001 From: tb Date: Sun, 14 Jul 2024 16:06:31 +0000 Subject: [PATCH] Rewrite EVP_PKEY_add1_attr_by_NID() Instead of jumping through many layers that cause headache, we can achieve the same in an entirely straightforward way without losing clarity. ok jsing --- lib/libcrypto/evp/evp_pkey.c | 52 ++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/lib/libcrypto/evp/evp_pkey.c b/lib/libcrypto/evp/evp_pkey.c index 655ec107ff5..f9100e22682 100644 --- a/lib/libcrypto/evp/evp_pkey.c +++ b/lib/libcrypto/evp/evp_pkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_pkey.c,v 1.29 2024/07/14 16:04:10 tb Exp $ */ +/* $OpenBSD: evp_pkey.c,v 1.30 2024/07/14 16:06:31 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -141,6 +141,46 @@ error: } LCRYPTO_ALIAS(EVP_PKEY2PKCS8); +/* + * XXX - This is only used by openssl(1) pkcs12 for the Microsoft-specific + * NID_ms_csp_name and NID_LocalKeySet. This turns out to be the only reason + * why attributes hangs off the EVP_PKEY struct. + */ +int +EVP_PKEY_add1_attr_by_NID(EVP_PKEY *pkey, int nid, int type, + const unsigned char *bytes, int len) +{ + STACK_OF(X509_ATTRIBUTE) *attrs = NULL; + X509_ATTRIBUTE *attr = NULL; + int ret = 0; + + if ((attr = X509_ATTRIBUTE_create_by_NID(NULL, nid, type, + bytes, len)) == NULL) + goto err; + + if ((attrs = pkey->attributes) == NULL) + attrs = sk_X509_ATTRIBUTE_new_null(); + if (attrs == NULL) + goto err; + + if (sk_X509_ATTRIBUTE_push(attrs, attr) <= 0) + goto err; + attr = NULL; + + pkey->attributes = attrs; + attrs = NULL; + + ret = 1; + + err: + X509_ATTRIBUTE_free(attr); + if (attrs != pkey->attributes) + sk_X509_ATTRIBUTE_pop_free(attrs, X509_ATTRIBUTE_free); + + return ret; +} +LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_NID); + /* * XXX - delete all the garbage below in the next bump. */ @@ -203,16 +243,6 @@ EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key, const ASN1_OBJECT *obj, int type, } LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_OBJ); -int -EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key, int nid, int type, - const unsigned char *bytes, int len) -{ - if (X509at_add1_attr_by_NID(&key->attributes, nid, type, bytes, len)) - return 1; - return 0; -} -LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_NID); - int EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key, const char *attrname, int type, const unsigned char *bytes, int len) -- 2.20.1