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

Merge pull request #3532 from julek-wolfssl/nginx-1.7.7

Browse Source 
Changes for Nginx 1.7.7
This commit is contained in:
toddouska
2020-12-16 09:01:27 -08:00
committed by GitHub
parent b0464c93e2 575f4ba140
commit cee91c91f5
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ssl.c
View File

@ -5522,8 +5522,15 @@ int ProcessBuffer(WOLFSSL_CTX* ctx, const unsigned char* buff,
if (ret != 0) if (ret != 0)
return ret; return ret;
if (keyFormat == 0) if (keyFormat == 0) {
#ifdef OPENSSL_EXTRA
/* Reaching this point probably means that the
* decryption password is wrong */
if (info->passwd_cb)
EVPerr(0, EVP_R_BAD_DECRYPT);
#endif
return WOLFSSL_BAD_FILE; return WOLFSSL_BAD_FILE;
}
(void)devId; (void)devId;
} }
@ -29439,7 +29446,6 @@ void wolfSSL_DH_free(WOLFSSL_DH* dh)
} }
} }
#if !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION>2))
int SetDhInternal(WOLFSSL_DH* dh) int SetDhInternal(WOLFSSL_DH* dh)
{ {
int ret = WOLFSSL_FATAL_ERROR; int ret = WOLFSSL_FATAL_ERROR;
@ -29569,6 +29575,7 @@ int SetDhExternal(WOLFSSL_DH *dh)
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
} }
#ifdef WOLFSSL_DH_EXTRA
if (SetIndividualExternal(&dh->priv_key, &key->priv) != WOLFSSL_SUCCESS) { if (SetIndividualExternal(&dh->priv_key, &key->priv) != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("No DH Private Key"); WOLFSSL_MSG("No DH Private Key");
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
@ -29578,12 +29585,12 @@ int SetDhExternal(WOLFSSL_DH *dh)
WOLFSSL_MSG("No DH Public Key"); WOLFSSL_MSG("No DH Public Key");
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
} }
#endif /* WOLFSSL_DH_EXTRA */
dh->exSet = 1; dh->exSet = 1;
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#endif /* !HAVE_FIPS || HAVE_FIPS_VERSION > 2 */
#endif /* !NO_DH && (WOLFSSL_QT || OPENSSL_ALL) */ #endif /* !NO_DH && (WOLFSSL_QT || OPENSSL_ALL) */
/* return code compliant with OpenSSL : /* return code compliant with OpenSSL :
@ -39853,7 +39860,7 @@ err:
ret = AllocDer(&ctx->certificate, x->derCert->length, CERT_TYPE, ret = AllocDer(&ctx->certificate, x->derCert->length, CERT_TYPE,
ctx->heap); ctx->heap);
if (ret != 0) if (ret != 0)
return 0; return WOLFSSL_FAILURE;
XMEMCPY(ctx->certificate->buffer, x->derCert->buffer, XMEMCPY(ctx->certificate->buffer, x->derCert->buffer,
x->derCert->length); x->derCert->length);
@ -39864,10 +39871,13 @@ err:
} }
#ifndef WOLFSSL_X509_STORE_CERTS #ifndef WOLFSSL_X509_STORE_CERTS
ctx->ourCert = x; ctx->ourCert = x;
if (wolfSSL_X509_up_ref(x) != 1) {
return WOLFSSL_FAILURE;
}
#else #else
ctx->ourCert = wolfSSL_X509_d2i(NULL, x->derCert->buffer,x->derCert->length); ctx->ourCert = wolfSSL_X509_d2i(NULL, x->derCert->buffer,x->derCert->length);
if(ctx->ourCert == NULL){ if(ctx->ourCert == NULL){
return 0; return WOLFSSL_FAILURE;
} }
#endif #endif
@ -40707,7 +40717,6 @@ WOLFSSL_BIO* wolfSSL_BIO_new_fp(XFILE fp, int close_flag)
#ifndef NO_DH #ifndef NO_DH
#ifndef NO_BIO #ifndef NO_BIO
#if !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION>2))
WOLFSSL_DH *wolfSSL_PEM_read_bio_DHparams(WOLFSSL_BIO *bio, WOLFSSL_DH **x, WOLFSSL_DH *wolfSSL_PEM_read_bio_DHparams(WOLFSSL_BIO *bio, WOLFSSL_DH **x,
pem_password_cb *cb, void *u) pem_password_cb *cb, void *u)
{ {
@ -40837,7 +40846,6 @@ end:
return NULL; return NULL;
#endif #endif
} }
#endif /* !HAVE_FIPS || HAVE_FIPS_VERSION > 2 */
#endif /* !NO_BIO */ #endif /* !NO_BIO */
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM

7
wolfssl/openssl/ssl.h
View File

@ -808,6 +808,13 @@ wolfSSL_X509_STORE_set_verify_cb((WOLFSSL_X509_STORE *)(s), (WOLFSSL_X509_STORE_
#define PEMerr(func, reason) WOLFSSL_ERROR_LINE((reason), \ #define PEMerr(func, reason) WOLFSSL_ERROR_LINE((reason), \
NULL, __LINE__, __FILE__, NULL) NULL, __LINE__, __FILE__, NULL)
#endif #endif
#ifndef WOLFCRYPT_ONLY
#define EVPerr(func, reason) wolfSSL_ERR_put_error(ERR_LIB_EVP, \
(func), (reason), __FILE__, __LINE__)
#else
#define EVPerr(func, reason) WOLFSSL_ERROR_LINE((reason), \
NULL, __LINE__, __FILE__, NULL)
#endif
#define SSLv23_server_method wolfSSLv23_server_method #define SSLv23_server_method wolfSSLv23_server_method
#define SSL_CTX_set_options wolfSSL_CTX_set_options #define SSL_CTX_set_options wolfSSL_CTX_set_options