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

Merge pull request #4928 from cconlon/compatCleanups

Browse Source
This commit is contained in:
Hayden Roche
2022-03-18 16:23:56 -07:00
committed by GitHub
parent 2637e5e361 82c6f58eb0
commit 7ea6b73c7b
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ssl.c
View File

@@ -39050,7 +39050,7 @@ int wolfSSL_EC_KEY_set_public_key(WOLFSSL_EC_KEY *key,
if (key == NULL || key->internal == NULL || if (key == NULL || key->internal == NULL ||
pub == NULL || pub->internal == NULL) { pub == NULL || pub->internal == NULL) {
WOLFSSL_MSG("wolfSSL_EC_GROUP_get_order Bad arguments"); WOLFSSL_MSG("wolfSSL_EC_KEY_set_public_key Bad arguments");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@@ -48350,7 +48350,7 @@ int wolfSSL_PEM_write_bio_X509(WOLFSSL_BIO *bio, WOLFSSL_X509 *cert)
#endif #endif
int ret; int ret;
WOLFSSL_ENTER("wolfSSL_PEM_write_bio_X509_AUX()"); WOLFSSL_ENTER("wolfSSL_PEM_write_bio_X509()");
if (bio == NULL || cert == NULL) { if (bio == NULL || cert == NULL) {
WOLFSSL_MSG("NULL argument passed in"); WOLFSSL_MSG("NULL argument passed in");
@@ -57235,14 +57235,14 @@ void wolfSSL_X509V3_set_ctx(WOLFSSL_X509V3_CTX* ctx, WOLFSSL_X509* issuer,
{ {
int ret = WOLFSSL_SUCCESS; int ret = WOLFSSL_SUCCESS;
WOLFSSL_ENTER("wolfSSL_X509V3_set_ctx"); WOLFSSL_ENTER("wolfSSL_X509V3_set_ctx");
if (!ctx || !ctx->x509) if (!ctx)
return; return;
if (!ctx->x509) { /* not checking ctx->x509 for null first since app won't have initalized
* this X509V3_CTX before this function call */
ctx->x509 = wolfSSL_X509_new(); ctx->x509 = wolfSSL_X509_new();
if (!ctx->x509) if (!ctx->x509)
return; return;
}
/* Set parameters in ctx as long as ret == WOLFSSL_SUCCESS */ /* Set parameters in ctx as long as ret == WOLFSSL_SUCCESS */
if (issuer) if (issuer)
@@ -60643,6 +60643,7 @@ PKCS7* wolfSSL_d2i_PKCS7_ex(PKCS7** p7, const unsigned char** in, int len,
} }
if (wc_PKCS7_VerifySignedData(&pkcs7->pkcs7, pkcs7->data, pkcs7->len) if (wc_PKCS7_VerifySignedData(&pkcs7->pkcs7, pkcs7->data, pkcs7->len)
!= 0) { != 0) {
WOLFSSL_MSG("wc_PKCS7_VerifySignedData failed");
wolfSSL_PKCS7_free((PKCS7*)pkcs7); wolfSSL_PKCS7_free((PKCS7*)pkcs7);
return NULL; return NULL;
} }
@@ -60776,6 +60777,7 @@ PKCS7* wolfSSL_d2i_PKCS7_bio(WOLFSSL_BIO* bio, PKCS7** p7)
if (wc_PKCS7_VerifySignedData(&pkcs7->pkcs7, pkcs7->data, pkcs7->len) if (wc_PKCS7_VerifySignedData(&pkcs7->pkcs7, pkcs7->data, pkcs7->len)
!= 0) { != 0) {
WOLFSSL_MSG("wc_PKCS7_VerifySignedData failed");
wolfSSL_PKCS7_free((PKCS7*)pkcs7); wolfSSL_PKCS7_free((PKCS7*)pkcs7);
return NULL; return NULL;
} }

3
wolfssl/openssl/bio.h
View File

@@ -57,6 +57,7 @@
#define BIO_s_file wolfSSL_BIO_s_file #define BIO_s_file wolfSSL_BIO_s_file
#define BIO_s_bio wolfSSL_BIO_s_bio #define BIO_s_bio wolfSSL_BIO_s_bio
#define BIO_s_socket wolfSSL_BIO_s_socket #define BIO_s_socket wolfSSL_BIO_s_socket
#define BIO_s_accept wolfSSL_BIO_s_socket
#define BIO_set_fd wolfSSL_BIO_set_fd #define BIO_set_fd wolfSSL_BIO_set_fd
#define BIO_set_close wolfSSL_BIO_set_close #define BIO_set_close wolfSSL_BIO_set_close
#define BIO_ctrl_reset_read_request wolfSSL_BIO_ctrl_reset_read_request #define BIO_ctrl_reset_read_request wolfSSL_BIO_ctrl_reset_read_request
@@ -140,6 +141,8 @@
#define BIO_CTRL_RESET 1 #define BIO_CTRL_RESET 1
#define BIO_CTRL_EOF 2 #define BIO_CTRL_EOF 2
#define BIO_CTRL_INFO 3 #define BIO_CTRL_INFO 3
#define BIO_CTRL_SET 4
#define BIO_CTRL_GET 5
#define BIO_CTRL_PUSH 6 #define BIO_CTRL_PUSH 6
#define BIO_CTRL_POP 7 #define BIO_CTRL_POP 7
#define BIO_CTRL_GET_CLOSE 8 #define BIO_CTRL_GET_CLOSE 8

3
wolfssl/ssl.h
View File

@@ -2240,9 +2240,6 @@ enum {
*/ */
SSL_MODE_RELEASE_BUFFERS = -1, /* For libwebsockets build. No current use. */ SSL_MODE_RELEASE_BUFFERS = -1, /* For libwebsockets build. No current use. */
BIO_CLOSE = 1,
BIO_NOCLOSE = 0,
X509_FILETYPE_PEM = 8, X509_FILETYPE_PEM = 8,
/* Not all of these are actually used in wolfSSL. Some are included to /* Not all of these are actually used in wolfSSL. Some are included to