Skip to content

Commit bfebeae

Browse files
committed
Revert PR #8911. For TLS v1.2 RSA only is only supported with WOLFSSL_STATIC_RSA. For TLS v1.3 RSA only is not supported (must be PFS).
1 parent 978a29d commit bfebeae

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

src/internal.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19621,8 +19621,8 @@ static WC_INLINE int EncryptDo(WOLFSSL* ssl, byte* out, const byte* input,
1962119621
#endif
1962219622

1962319623
(void)out;
19624-
(void)input;
1962519624
(void)sz;
19625+
(void)type;
1962619626

1962719627
if (input == NULL) {
1962819628
return BAD_FUNC_ARG;
@@ -19699,8 +19699,8 @@ static WC_INLINE int EncryptDo(WOLFSSL* ssl, byte* out, const byte* input,
1969919699
additionalSz = writeAeadAuthData(ssl,
1970019700
/* Length of the plain text minus the explicit
1970119701
* IV length minus the authentication tag size. */
19702-
sz - (word16)(AESGCM_EXP_IV_SZ) - ssl->specs.aead_mac_size, type,
19703-
ssl->encrypt.additional, 0, NULL, CUR_ORDER);
19702+
sz - (word16)(AESGCM_EXP_IV_SZ) - ssl->specs.aead_mac_size,
19703+
type, ssl->encrypt.additional, 0, NULL, CUR_ORDER);
1970419704
if (additionalSz < 0) {
1970519705
ret = additionalSz;
1970619706
break;

src/ssl.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@
4848
#if !defined(WOLFSSL_ALLOW_NO_SUITES) && !defined(WOLFCRYPT_ONLY)
4949
#if defined(NO_DH) && !defined(HAVE_ECC) && !defined(WOLFSSL_STATIC_RSA) \
5050
&& !defined(WOLFSSL_STATIC_DH) && !defined(WOLFSSL_STATIC_PSK) \
51-
&& !defined(HAVE_CURVE25519) && !defined(HAVE_CURVE448) \
52-
&& defined(NO_RSA)
51+
&& !defined(HAVE_CURVE25519) && !defined(HAVE_CURVE448)
5352
#error "No cipher suites defined because DH disabled, ECC disabled, " \
54-
"RSA disabled and no static suites defined. " \
55-
"Please see top of README"
53+
"and no static suites defined. Please see top of README"
5654
#endif
5755
#ifdef WOLFSSL_CERT_GEN
5856
/* need access to Cert struct for creating certificate */

0 commit comments

Comments
 (0)