From 77600210e20b566f746fcc7fc18f44f1b01a2313 Mon Sep 17 00:00:00 2001 From: "Dr. David von Oheimb" Date: Thu, 4 Jul 2024 09:27:54 +0200 Subject: [PATCH] X509at_add1_attr*(): extend error entry on duplicate attribute Reviewed-by: Neil Horman Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/24792) --- crypto/x509/x509_att.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c index 5b002832c1d..c9e2b26c7a8 100644 --- a/crypto/x509/x509_att.c +++ b/crypto/x509/x509_att.c @@ -123,7 +123,8 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, return NULL; } if (*x != NULL && X509at_get_attr_by_OBJ(*x, attr->object, -1) != -1) { - ERR_raise(ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE); + ERR_raise_data(ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE, + "name=%s", OBJ_nid2sn(OBJ_obj2nid(attr->object))); return NULL; } @@ -158,7 +159,8 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) return NULL; } if (*x != NULL && X509at_get_attr_by_OBJ(*x, obj, -1) != -1) { - ERR_raise(ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE); + ERR_raise_data(ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE, + "name=%s", OBJ_nid2sn(OBJ_obj2nid(obj))); return NULL; } @@ -191,7 +193,8 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) return NULL; } if (*x != NULL && X509at_get_attr_by_NID(*x, nid, -1) != -1) { - ERR_raise(ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE); + ERR_raise_data(ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE, + "name=%s", OBJ_nid2sn(nid)); return NULL; } -- 2.47.2