root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

X509at_add1_attr*(): extend error entry on duplicate attribute 

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24792)
This commit is contained in:
Dr. David von Oheimb 2024-07-04 09:27:54 +02:00 committed by Tomas Mraz
parent 39424d9601
commit 77600210e2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/x509/x509_att.c
View File

@ -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;
}