Skip to content

Commit 2a1df11

Browse files
authored
Merge pull request #9145 from kareem-wolfssl/zd20038_2
Fix building with --coding=no/WOLFSSL_PEM_TO_DER undefined.
2 parents 1dc40c5 + 183aa7a commit 2a1df11

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

.github/workflows/os-check.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
'--disable-sys-ca-certs',
6161
'--enable-all CPPFLAGS=-DWOLFSSL_DEBUG_CERTS ',
6262
'--enable-all CFLAGS="-DWOLFSSL_CHECK_MEM_ZERO"',
63+
'--enable-coding=no',
6364
]
6465
name: make check
6566
if: github.repository_owner == 'wolfssl'

src/ssl_certman.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,9 @@ int wolfSSL_CertManagerLoadCABufferType(WOLFSSL_CERT_MANAGER* cm,
600600
ret = WOLFSSL_FATAL_ERROR;
601601
} else {
602602
if (format == WOLFSSL_FILETYPE_PEM) {
603+
#ifndef WOLFSSL_PEM_TO_DER
604+
ret = NOT_COMPILED_IN;
605+
#else
603606
ret = PemToDer(buff, sz, CERT_TYPE, &der, cm->heap, NULL, NULL);
604607
if (!ret) {
605608
/* Replace buffer pointer and size with DER buffer. */
@@ -610,6 +613,7 @@ int wolfSSL_CertManagerLoadCABufferType(WOLFSSL_CERT_MANAGER* cm,
610613
WOLFSSL_ERROR(ret);
611614
ret = WOLFSSL_FATAL_ERROR;
612615
}
616+
#endif
613617
}
614618

615619
if (ret == WOLFSSL_SUCCESS) {

0 commit comments

Comments
 (0)