feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge branch 'master' of https://github.com/wolfSSL/wolfssl into wolfASIO

Browse Source
This commit is contained in:
MJSPollard
2018-07-19 10:26:54 -06:00
parent da1ac3643f 70dfb9af72
commit 42985d8250
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/asn.c
View File

@@ -8210,8 +8210,6 @@ int wc_CertPemToDer(const unsigned char* pem, int pemSz,
#endif /* WOLFSSL_PEM_TO_DER || WOLFSSL_DER_TO_PEM */ #endif /* WOLFSSL_PEM_TO_DER || WOLFSSL_DER_TO_PEM */
#ifndef NO_FILESYSTEM
#ifdef WOLFSSL_PEM_TO_DER #ifdef WOLFSSL_PEM_TO_DER
#if defined(WOLFSSL_CERT_EXT) || defined(WOLFSSL_PUB_PEM_TO_DER) #if defined(WOLFSSL_CERT_EXT) || defined(WOLFSSL_PUB_PEM_TO_DER)
/* Return bytes written to buff or < 0 for error */ /* Return bytes written to buff or < 0 for error */
@@ -8249,6 +8247,8 @@ int wc_PubKeyPemToDer(const unsigned char* pem, int pemSz,
#endif /* WOLFSSL_CERT_EXT || WOLFSSL_PUB_PEM_TO_DER */ #endif /* WOLFSSL_CERT_EXT || WOLFSSL_PUB_PEM_TO_DER */
#endif /* WOLFSSL_PEM_TO_DER */ #endif /* WOLFSSL_PEM_TO_DER */
#ifndef NO_FILESYSTEM
#ifdef WOLFSSL_CERT_GEN #ifdef WOLFSSL_CERT_GEN
/* load pem cert from file into der buffer, return der size or error */ /* load pem cert from file into der buffer, return der size or error */
int wc_PemCertToDer(const char* fileName, unsigned char* derBuf, int derSz) int wc_PemCertToDer(const char* fileName, unsigned char* derBuf, int derSz)