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

return macro and macro guards

Browse Source
This commit is contained in:
Jacob Barthelmeh
2021-09-15 03:16:38 -06:00
committed by Hayden Roche
parent dae4d637c9
commit 3f534e7e07
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bio.c
View File

@ -1660,9 +1660,6 @@ void* wolfSSL_BIO_get_data(WOLFSSL_BIO* bio)
*/
long wolfSSL_BIO_set_nbio(WOLFSSL_BIO* bio, long on)
{
#ifndef WOLFSSL_DTLS
(void)on;
#endif
WOLFSSL_ENTER("wolfSSL_BIO_set_nbio");
if (bio) {
@ -1696,6 +1693,7 @@ long wolfSSL_BIO_set_nbio(WOLFSSL_BIO* bio, long on)
}
}
(void)on;
return 1;
}

3
src/ssl.c
View File

@ -30549,6 +30549,7 @@ const WOLFSSL_ObjectInfo wolfssl_object_info[] = {
#ifdef WOLFSSL_SHA512
{ NID_sha512, SHA512h, oidHashType, "SHA512", "sha512"},
#endif
#ifdef WOLFSSL_SHA3
#ifndef WOLFSSL_NOSHA3_224
{ NID_sha3_224, SHA3_224h, oidHashType, "SHA3-224", "sha3-224"},
#endif
@ -30561,7 +30562,7 @@ const WOLFSSL_ObjectInfo wolfssl_object_info[] = {
#ifndef WOLFSSL_NOSHA3_512
{ NID_sha3_512, SHA3_512h, oidHashType, "SHA3-512", "sha3-512"},
#endif
#endif /* WOLFSSL_SHA3 */
/* oidSigType */
#ifndef NO_DSA
#ifndef NO_SHA

6
wolfssl/openssl/ssl.h
View File

@ -1387,9 +1387,9 @@ wolfSSL_X509_STORE_set_verify_cb((WOLFSSL_X509_STORE *)(s), (WOLFSSL_X509_STORE_
/* Some openssl consumers try to detect these options with ifdef, defining
* here since we use an enum internally instead */
#define SSL_OP_SINGLE_DH_USE SSL_OP_SINGLE_DH_USE
#define SSL_OP_SINGLE_ECDH_USE SSL_OP_SINGLE_ECDH_USE
#define SSL_OP_CIPHER_SERVER_PREFERENCE SSL_OP_CIPHER_SERVER_PREFERENCE
#define SSL_OP_SINGLE_DH_USE WOLFSSL_OP_SINGLE_DH_USE
#define SSL_OP_SINGLE_ECDH_USE WOLFSSL_OP_SINGLE_ECDH_USE
#define SSL_OP_CIPHER_SERVER_PREFERENCE WOLFSSL_OP_CIPHER_SERVER_PREFERENCE
#define OPENSSL_config wolfSSL_OPENSSL_config
#define OPENSSL_memdup wolfSSL_OPENSSL_memdup