Skip to content

Commit 8bde5e6

Browse files
Fix printing empty names in certificates
The empty-issuer-cert.pem certificate was created with: wolfssl genkey rsa -size 2048 -out mykey -outform pem -output KEY wolfssl req -new -days 3650 -key mykey.priv -out empty-issuer-cert.pem -x509 Prior to this fix this command would error printing the certificate: wolfssl x509 -inform pem -in empty-issuer-cert.pem -text
1 parent e74214d commit 8bde5e6

5 files changed

Lines changed: 39 additions & 2 deletions

File tree

certs/empty-issuer-cert.pem

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIICnTCCAYWgAwIBAgIQToFDJ79b/2ZHXVCCCNt8VTANBgkqhkiG9w0BAQsFADAA
3+
MB4XDTI1MDYxMjIwMTE0N1oXDTM1MDYxMDIwMTE0N1owADCCASIwDQYJKoZIhvcN
4+
AQEBBQADggEPADCCAQoCggEBAOI/4VVa7Pk0NWS7BQGM4ZbuTapoza4baS9+TRbT
5+
QUqgN28gChSw/kHNp4BU/KQhKN/Mp0NN2vmYzRVDB25L1HWph8TqCO+Kqa6XYvnN
6+
CgMEYyumWYWJr2u6hjpF19QeiZ26ezgnDbpkFiysdzn7+MG+PjtRj3mcnaKb1PjK
7+
1P2j9pcrhc/WLo39y+OF2+3nW7JeqJHgAdXgeTLPaFyf91ktaWSLmc3pLqlurLup
8+
pcClP6CKkLClz2Re3eM2/qdTEDO1pU8DRPc5v8qHxuX4K4DD0HYwWXFWDW8Ce+Ta
9+
3o2hrM3mKtQH4n2xoJhJKXlcyrOu++SE4iyaSnooYLxkIqsCAwEAAaMTMBEwDwYD
10+
VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAhBolr3oHIKUrKp0eC1AO
11+
1+byE+vjuDIs0JBtAQ6TD4VTb9E2YavckOXcs0deHM7FUY2TcZ01A0msqtTYYyJ4
12+
9D325+jrh4FIACrOOyVblWaO+lentmBhexzEXPWS6EhYTDTeZvY1AzDRTkBKm245
13+
yqeqALL9K5KWdKesQurmt2FKzlc0WSQJmyfVf0IUdHgF05yjECOksYQdFDpeewNF
14+
+1IKwHKemEtnIYatGv0w7XNeUrGTsgVa9vk0Uzg+wIh9+ZeJpOS21010ph6BkaeC
15+
8Y1+kK7bZc0kBw5V20w16QtbE2MZucjlNLzjvAW5rVFNlBaiO7WIHPTvJfk38hq9
16+
zw==
17+
-----END CERTIFICATE-----

certs/include.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ EXTRA_DIST += \
3030
certs/ecc-keyPkcs8.der \
3131
certs/ecc-client-key.pem \
3232
certs/ecc-client-keyPub.pem \
33+
certs/empty-issuer-cert.pem \
3334
certs/client-ecc-cert.pem \
3435
certs/client-ca.pem \
3536
certs/dh2048.pem \

src/x509.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13874,7 +13874,7 @@ int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name,
1387413874

1387513875
WOLFSSL_ENTER("wolfSSL_X509_NAME_print_ex");
1387613876

13877-
if ((name == NULL) || (name->sz == 0) || (bio == NULL))
13877+
if ((name == NULL) || (bio == NULL))
1387813878
return WOLFSSL_FAILURE;
1387913879

1388013880
XMEMSET(eqStr, 0, sizeof(eqStr));

tests/api.c

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22154,7 +22154,7 @@ static int test_wolfSSL_X509_NAME_print_ex(void)
2215422154
ExpectIntEQ(X509_NAME_print_ex(NULL, NULL, 0, 0), WOLFSSL_FAILURE);
2215522155
ExpectIntEQ(X509_NAME_print_ex(membio, NULL, 0, 0), WOLFSSL_FAILURE);
2215622156
ExpectIntEQ(X509_NAME_print_ex(NULL, name, 0, 0), WOLFSSL_FAILURE);
22157-
ExpectIntEQ(X509_NAME_print_ex(membio, empty, 0, 0), WOLFSSL_FAILURE);
22157+
ExpectIntEQ(X509_NAME_print_ex(membio, empty, 0, 0), WOLFSSL_SUCCESS);
2215822158
ExpectIntEQ(X509_NAME_print_ex(membio, name, 0, 0), WOLFSSL_SUCCESS);
2215922159
wolfSSL_X509_NAME_free(empty);
2216022160
BIO_free(membio);
@@ -22178,6 +22178,23 @@ static int test_wolfSSL_X509_NAME_print_ex(void)
2217822178
BIO_free(bio);
2217922179
name = NULL;
2218022180

22181+
/* Test with empty issuer cert. */
22182+
ExpectNotNull(bio = BIO_new(BIO_s_file()));
22183+
ExpectIntGT(BIO_read_filename(bio, noIssuerCertFile), 0);
22184+
ExpectNotNull(PEM_read_bio_X509(bio, &x509, NULL, NULL));
22185+
ExpectNotNull(name = X509_get_subject_name(x509));
22186+
22187+
ExpectNotNull(membio = BIO_new(BIO_s_mem()));
22188+
ExpectIntEQ(X509_NAME_print_ex(membio, name, 0, 0), WOLFSSL_SUCCESS);
22189+
/* Should be empty string "" */
22190+
ExpectIntEQ((memSz = BIO_get_mem_data(membio, &mem)), 0);
22191+
22192+
BIO_free(membio);
22193+
membio = NULL;
22194+
X509_free(x509);
22195+
BIO_free(bio);
22196+
name = NULL;
22197+
2218122198
/* Test normal case without escaped characters */
2218222199
{
2218322200
/* Create name: "/C=US/CN=wolfssl.com" */

wolfssl/test.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,7 @@ err_sys_with_errno(const char* msg)
527527
#define cliEd448CertFile "certs/ed448/client-ed448.pem"
528528
#define cliEd448KeyFile "certs/ed448/client-ed448-priv.pem"
529529
#define caEd448CertFile "certs/ed448/ca-ed448.pem"
530+
#define noIssuerCertFile "certs/empty-issuer-cert.pem"
530531
#define caCertFolder "certs/"
531532
#ifdef HAVE_WNR
532533
/* Whitewood netRandom default config file */
@@ -590,6 +591,7 @@ err_sys_with_errno(const char* msg)
590591
#define cliEd448CertFile "./certs/ed448/client-ed448.pem"
591592
#define cliEd448KeyFile "./certs/ed448/client-ed448-priv.pem"
592593
#define caEd448CertFile "./certs/ed448/ca-ed448.pem"
594+
#define noIssuerCertFile "./certs/empty-issuer-cert.pem"
593595
#define caCertFolder "./certs/"
594596
#ifdef HAVE_WNR
595597
/* Whitewood netRandom default config file */

0 commit comments

Comments
 (0)