Skip to content

Fix pathlen not copied in ASN1_OBJECT_dup and not marked set in X509_add_ext #9940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JacobBarthelmeh merged 1 commit into from
Mar 12, 2026
Merged

Fix pathlen not copied in ASN1_OBJECT_dup and not marked set in X509_add_ext #9940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/ssl_asn1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2026,9 +2026,17 @@ WOLFSSL_ASN1_OBJECT* wolfSSL_ASN1_OBJECT_dup(WOLFSSL_ASN1_OBJECT* obj)
dupl->objSz = obj->objSz;
#ifdef OPENSSL_EXTRA
dupl->ca = obj->ca;
if (obj->pathlen != NULL) {
dupl->pathlen = wolfSSL_ASN1_INTEGER_dup(obj->pathlen);
if (dupl->pathlen == NULL) {
WOLFSSL_MSG("ASN1 pathlen alloc error");
Comment thread
cconlon marked this conversation as resolved.
wolfSSL_ASN1_OBJECT_free(dupl);
dupl = NULL;
}
}
Comment thread
cconlon marked this conversation as resolved.
#endif
/* Check for encoding. */
if (obj->obj) {
if (dupl != NULL && obj->obj) {
/* Allocate memory for ASN.1 OBJECT_ID DER encoding. */
dupl->obj = (const unsigned char*)XMALLOC(obj->objSz, NULL,
DYNAMIC_TYPE_ASN1);
Expand Down
1 change: 1 addition & 0 deletions src/x509.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1357,6 +1357,7 @@ int wolfSSL_X509_add_ext(WOLFSSL_X509 *x509, WOLFSSL_X509_EXTENSION *ext,
if (ext->obj->pathlen) {
x509->pathLength = (word32)ext->obj->pathlen->length;
x509->basicConstPlSet = 1;
x509->pathLengthSet = 1;
}
x509->basicConstSet = 1;
}
Expand Down
31 changes: 31 additions & 0 deletions tests/api/test_ossl_asn1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,6 +870,37 @@ int test_wolfSSL_ASN1_OBJECT(void)
s.objSz = sizeof(der);
ExpectNotNull(a = wolfSSL_ASN1_OBJECT_dup(&s));
ASN1_OBJECT_free(a);
a = NULL;
ASN1_OBJECT_free(&s);

/* Test dup copies pathlen when set */
XMEMSET(&s, 0, sizeof(ASN1_OBJECT));
Comment thread
cconlon marked this conversation as resolved.
s.type = NID_basic_constraints;
s.ca = 1;
s.pathlen = wolfSSL_ASN1_INTEGER_new();
ExpectNotNull(s.pathlen);
if (s.pathlen != NULL) {
s.pathlen->length = 5;
}
ExpectNotNull(a = wolfSSL_ASN1_OBJECT_dup(&s));
if (a != NULL) {
ExpectIntEQ(a->ca, 1);
ExpectNotNull(a->pathlen);
if (a->pathlen != NULL) {
ExpectIntEQ(a->pathlen->length, 5);
}
}
ASN1_OBJECT_free(a);
a = NULL;

/* Test dup with NULL pathlen leaves it NULL */
wolfSSL_ASN1_INTEGER_free(s.pathlen);
s.pathlen = NULL;
ExpectNotNull(a = wolfSSL_ASN1_OBJECT_dup(&s));
if (a != NULL) {
ExpectNull(a->pathlen);
}
ASN1_OBJECT_free(a);
ASN1_OBJECT_free(&s);
#endif /* OPENSSL_EXTRA */
return EXPECT_RESULT();
Expand Down
2 changes: 2 additions & 0 deletions tests/api/test_ossl_x509_ext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ static int test_X509_add_basic_constraints(WOLFSSL_X509* x509)
ExpectIntEQ(wolfSSL_X509_add_ext(x509, ext, -1), WOLFSSL_SUCCESS);
ExpectIntEQ(x509->isCa, 0);
ExpectIntEQ(x509->pathLength, 2);
ExpectIntEQ(x509->pathLengthSet, 1);
if (ext != NULL && ext->obj != NULL) {
/* Add second time to without path length. */
ext->obj->ca = 1;
Expand All @@ -290,6 +291,7 @@ static int test_X509_add_basic_constraints(WOLFSSL_X509* x509)
ExpectIntEQ(wolfSSL_X509_add_ext(x509, ext, -1), WOLFSSL_SUCCESS);
ExpectIntEQ(x509->isCa, 1);
ExpectIntEQ(x509->pathLength, 2);
ExpectIntEQ(x509->pathLengthSet, 1);
ExpectIntEQ(wolfSSL_X509_get_isSet_pathLength(NULL), 0);
ExpectIntEQ(wolfSSL_X509_get_isSet_pathLength(x509), 1);
ExpectIntEQ(wolfSSL_X509_get_pathLength(NULL), 0);
Expand Down
Loading