wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix some flaws caused by rebase

Browse Source
This commit is contained in:
Go Hosohara
2018-09-03 20:34:10 +09:00
parent a189d00fc9
commit c7cfa74577
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ssl.c
View File

@ -28510,7 +28510,7 @@ int wolfSSL_i2d_RSAPublicKey(WOLFSSL_RSA *rsa, const unsigned char **pp)
int ret; int ret;
WOLFSSL_ENTER("i2d_RSAPublicKey"); WOLFSSL_ENTER("i2d_RSAPublicKey");
if ((rsa == NULL) || (pp == NULL)) if (rsa == NULL)
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
if ((ret = SetRsaInternal(rsa)) != WOLFSSL_SUCCESS) { if ((ret = SetRsaInternal(rsa)) != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("SetRsaInternal Failed"); WOLFSSL_MSG("SetRsaInternal Failed");
@ -29590,10 +29590,10 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
WOLFSSL_LEAVE("wolfSSL_PEM_read_X509", BAD_FUNC_ARG); WOLFSSL_LEAVE("wolfSSL_PEM_read_X509", BAD_FUNC_ARG);
return NULL; return NULL;
} }
/* Read in CRL from file */ /* Read cert from file */
i = XFTELL(fp); i = XFTELL(fp);
if (i < 0) { if (i < 0) {
WOLFSSL_LEAVE("wolfSSL_PEM_read_X509_CRL", BAD_FUNC_ARG); WOLFSSL_LEAVE("wolfSSL_PEM_read_X509", BAD_FUNC_ARG);
return NULL; return NULL;
} }
@ -29613,10 +29613,6 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
if((int)XFREAD((char *)pem, 1, pemSz, fp) != pemSz) if((int)XFREAD((char *)pem, 1, pemSz, fp) != pemSz)
goto err_exit; goto err_exit;
if((PemToDer(pem, pemSz, CRL_TYPE, &der, NULL, NULL, NULL)) < 0)
goto err_exit;
XFREE(pem, 0, DYNAMIC_TYPE_PEM);
pem = NULL;
switch(type){ switch(type){
case CERT_TYPE: case CERT_TYPE: