Skip to content

Commit 484f352

Browse files
authored
Merge pull request #9179 from wolfSSL/revert-9145-zd20038_2
Revert "Fix building with --coding=no/WOLFSSL_PEM_TO_DER undefined."
2 parents e3423d0 + 74c7115 commit 484f352

2 files changed

Lines changed: 0 additions & 5 deletions

File tree

.github/workflows/os-check.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ 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',
6463
]
6564
name: make check
6665
if: github.repository_owner == 'wolfssl'

src/ssl_certman.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -600,9 +600,6 @@ 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
606603
ret = PemToDer(buff, sz, CERT_TYPE, &der, cm->heap, NULL, NULL);
607604
if (!ret) {
608605
/* Replace buffer pointer and size with DER buffer. */
@@ -613,7 +610,6 @@ int wolfSSL_CertManagerLoadCABufferType(WOLFSSL_CERT_MANAGER* cm,
613610
WOLFSSL_ERROR(ret);
614611
ret = WOLFSSL_FATAL_ERROR;
615612
}
616-
#endif
617613
}
618614

619615
if (ret == WOLFSSL_SUCCESS) {

0 commit comments

Comments
 (0)