wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5377 from kareem-wolfssl/rsaKeyEncipher

Browse Source 
Don't require digital signature bit for static RSA cipher suites.  Make wolfSSL_CTX_clear_options available without OPENSSL_EXTRA.
This commit is contained in:
David Garske
2022-07-20 15:28:55 -07:00
committed by GitHub
parent bd2b510487 741d61574b
commit 706ab6aac0
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/internal.c
View File

@@ -13379,7 +13379,8 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx,
(args->dCert->extKeyUsage & KEYUSE_KEY_ENCIPHER) == 0) { (args->dCert->extKeyUsage & KEYUSE_KEY_ENCIPHER) == 0) {
ret = KEYUSE_ENCIPHER_E; ret = KEYUSE_ENCIPHER_E;
} }
if ((ssl->specs.sig_algo == rsa_sa_algo || if ((ssl->specs.kea != rsa_kea) &&
(ssl->specs.sig_algo == rsa_sa_algo ||
(ssl->specs.sig_algo == ecc_dsa_sa_algo && (ssl->specs.sig_algo == ecc_dsa_sa_algo &&
!ssl->specs.static_ecdh)) && !ssl->specs.static_ecdh)) &&
(args->dCert->extKeyUsage & KEYUSE_DIGITAL_SIG) == 0) { (args->dCert->extKeyUsage & KEYUSE_DIGITAL_SIG) == 0) {

4
src/ssl.c
View File

@@ -15896,8 +15896,6 @@ cleanup:
return ctx->mask; return ctx->mask;
} }
#ifdef OPENSSL_EXTRA
long wolfSSL_CTX_clear_options(WOLFSSL_CTX* ctx, long opt) long wolfSSL_CTX_clear_options(WOLFSSL_CTX* ctx, long opt)
{ {
WOLFSSL_ENTER("SSL_CTX_clear_options"); WOLFSSL_ENTER("SSL_CTX_clear_options");
@@ -15907,6 +15905,8 @@ cleanup:
return ctx->mask; return ctx->mask;
} }
#ifdef OPENSSL_EXTRA
int wolfSSL_set_rfd(WOLFSSL* ssl, int rfd) int wolfSSL_set_rfd(WOLFSSL* ssl, int rfd)
{ {
WOLFSSL_ENTER("SSL_set_rfd"); WOLFSSL_ENTER("SSL_set_rfd");

2
tests/api.c
View File

@@ -35525,10 +35525,8 @@ static void test_wolfSSL_set_options(void)
WOLFSSL_OP_NO_TLSv1_2) == WOLFSSL_OP_NO_TLSv1_2); WOLFSSL_OP_NO_TLSv1_2) == WOLFSSL_OP_NO_TLSv1_2);
AssertTrue((wolfSSL_CTX_set_options(ctx, WOLFSSL_OP_NO_COMPRESSION) & AssertTrue((wolfSSL_CTX_set_options(ctx, WOLFSSL_OP_NO_COMPRESSION) &
WOLFSSL_OP_NO_COMPRESSION) == WOLFSSL_OP_NO_COMPRESSION); WOLFSSL_OP_NO_COMPRESSION) == WOLFSSL_OP_NO_COMPRESSION);
#ifdef OPENSSL_EXTRA
AssertFalse((wolfSSL_CTX_clear_options(ctx, WOLFSSL_OP_NO_COMPRESSION) & AssertFalse((wolfSSL_CTX_clear_options(ctx, WOLFSSL_OP_NO_COMPRESSION) &
WOLFSSL_OP_NO_COMPRESSION)); WOLFSSL_OP_NO_COMPRESSION));
#endif
wolfSSL_CTX_free(ctx); wolfSSL_CTX_free(ctx);