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

Fix build error with X509_SMALL config

Browse Source
This commit is contained in:
Eric Blankenhorn
2020-07-21 16:36:30 -05:00
parent 61d81dd878
commit 89913076f1
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ssl.c
View File

@@ -29441,9 +29441,10 @@ int wolfSSL_DH_set0_pqg(WOLFSSL_DH *dh, WOLFSSL_BIGNUM *p,
#endif /* !HAVE_FIPS || HAVE_FIPS_VERSION > 2 */ #endif /* !HAVE_FIPS || HAVE_FIPS_VERSION > 2 */
#endif /* NO_DH */ #endif /* NO_DH */
#endif /* OPENSSL_EXTRA */
#if !defined(NO_DSA) && \
#ifndef NO_DSA (defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL))
static void InitwolfSSL_DSA(WOLFSSL_DSA* dsa) static void InitwolfSSL_DSA(WOLFSSL_DSA* dsa)
{ {
if (dsa) { if (dsa) {
@@ -29516,12 +29517,6 @@ void wolfSSL_DSA_free(WOLFSSL_DSA* dsa)
} }
} }
#endif /* NO_DSA */
#endif /* OPENSSL_EXTRA */
#ifdef OPENSSL_EXTRA
#ifndef NO_DSA
/* wolfSSL -> OpenSSL */ /* wolfSSL -> OpenSSL */
int SetDsaExternal(WOLFSSL_DSA* dsa) int SetDsaExternal(WOLFSSL_DSA* dsa)
{ {
@@ -29564,7 +29559,10 @@ int SetDsaExternal(WOLFSSL_DSA* dsa)
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#endif /* !NO_DSA && (OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL) */
#if !defined(NO_DSA) && defined(OPENSSL_EXTRA)
/* Openssl -> WolfSSL */ /* Openssl -> WolfSSL */
int SetDsaInternal(WOLFSSL_DSA* dsa) int SetDsaInternal(WOLFSSL_DSA* dsa)
{ {
@@ -29620,8 +29618,7 @@ int SetDsaInternal(WOLFSSL_DSA* dsa)
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#endif /* NO_DSA */ #endif /* !NO_DSA && OPENSSL_EXTRA */
#endif /* OPENSSL_EXTRA */
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
@@ -35559,8 +35556,8 @@ int wolfSSL_RSA_set0_key(WOLFSSL_RSA *r, WOLFSSL_BIGNUM *n, WOLFSSL_BIGNUM *e,
#endif /* OPENSSL_EXTRA */ #endif /* OPENSSL_EXTRA */
#endif /* NO_RSA */ #endif /* NO_RSA */
#ifdef OPENSSL_EXTRA #if !defined(NO_DSA) && \
#ifndef NO_DSA (defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL))
/* return WOLFSSL_SUCCESS if success, WOLFSSL_FATAL_ERROR if error */ /* return WOLFSSL_SUCCESS if success, WOLFSSL_FATAL_ERROR if error */
int wolfSSL_DSA_LoadDer(WOLFSSL_DSA* dsa, const unsigned char* derBuf, int derSz) int wolfSSL_DSA_LoadDer(WOLFSSL_DSA* dsa, const unsigned char* derBuf, int derSz)
{ {
@@ -35630,8 +35627,9 @@ int wolfSSL_DSA_LoadDer_ex(WOLFSSL_DSA* dsa, const unsigned char* derBuf,
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#endif /* !NO_DSA */ #endif /* !NO_DSA && (OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL) */
#ifdef OPENSSL_EXTRA
#ifdef HAVE_ECC #ifdef HAVE_ECC
/* return WOLFSSL_SUCCESS if success, WOLFSSL_FATAL_ERROR if error */ /* return WOLFSSL_SUCCESS if success, WOLFSSL_FATAL_ERROR if error */
int wolfSSL_EC_KEY_LoadDer(WOLFSSL_EC_KEY* key, const unsigned char* derBuf, int wolfSSL_EC_KEY_LoadDer(WOLFSSL_EC_KEY* key, const unsigned char* derBuf,

2
wolfssl/ssl.h
View File

@@ -3898,7 +3898,7 @@ WOLFSSL_API WOLFSSL_EVP_PKEY* wolfSSL_d2i_AutoPrivateKey(
WOLFSSL_API unsigned long wolfSSL_X509_subject_name_hash(const WOLFSSL_X509* x509); WOLFSSL_API unsigned long wolfSSL_X509_subject_name_hash(const WOLFSSL_X509* x509);
#endif /* OPENSSL_EXTRA */ #endif /* OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL */
#ifdef HAVE_PK_CALLBACKS #ifdef HAVE_PK_CALLBACKS
WOLFSSL_API int wolfSSL_IsPrivatePkSet(WOLFSSL* ssl); WOLFSSL_API int wolfSSL_IsPrivatePkSet(WOLFSSL* ssl);