wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-05-03 23:50:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2027 from dgarske/fix_buildopts

Browse Source 
Fixes for various build options and warnings
This commit is contained in:
toddouska
2019-01-16 10:32:19 -08:00
committed by GitHub
parent d7ecdf110e cfc66dab47
commit 5d262e9123
11 changed files with 57 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ssl.c
+2 -2
View File
@@ -30919,7 +30919,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
{ OCSP_NONCE_OID, OCSP_NONCE_OID, oidOcspType, "OCSP_nonce" },
#endif /* HAVE_OCSP */
#ifndef NO_CERT
#ifndef NO_CERTS
/* oidCertExtType */
{ BASIC_CA_OID, BASIC_CA_OID, oidCertExtType, "X509 basic ca" },
{ ALT_NAMES_OID, ALT_NAMES_OID, oidCertExtType, "X509 alt names" },
@@ -35791,7 +35791,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_d2i_AutoPrivateKey(WOLFSSL_EVP_PKEY** pkey,
}
#endif
#if defined(OPENSSL_ALL) && !defined(NO_CERT) && defined(WOLFSSL_CERT_GEN) && \
#if defined(OPENSSL_ALL) && !defined(NO_CERTS) && defined(WOLFSSL_CERT_GEN) && \
defined(WOLFSSL_CERT_REQ)
int wolfSSL_i2d_X509_REQ(WOLFSSL_X509* req, unsigned char** out)
{