WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8916 from dgarske/revert_pr8911 

Revert PR #8911
pull/8927/merge
Daniel Pouzzner 2025-06-25 21:52:34 -05:00 committed by GitHub
parent d6d124bb85 bfebeae533
commit 23a37b2ebc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/internal.c
View File

@ -19644,8 +19644,8 @@ static WC_INLINE int EncryptDo(WOLFSSL* ssl, byte* out, const byte* input,
#endif
(void)out;
(void)input;
(void)sz;
(void)type;
if (input == NULL) {
return BAD_FUNC_ARG;
@ -19722,8 +19722,8 @@ static WC_INLINE int EncryptDo(WOLFSSL* ssl, byte* out, const byte* input,
additionalSz = writeAeadAuthData(ssl,
/* Length of the plain text minus the explicit
* IV length minus the authentication tag size. */
sz - (word16)(AESGCM_EXP_IV_SZ) - ssl->specs.aead_mac_size, type,
ssl->encrypt.additional, 0, NULL, CUR_ORDER);
sz - (word16)(AESGCM_EXP_IV_SZ) - ssl->specs.aead_mac_size,
type, ssl->encrypt.additional, 0, NULL, CUR_ORDER);
if (additionalSz < 0) {
ret = additionalSz;
break;

6
src/ssl.c
View File

@ -48,11 +48,9 @@
#if !defined(WOLFSSL_ALLOW_NO_SUITES) && !defined(WOLFCRYPT_ONLY)
#if defined(NO_DH) && !defined(HAVE_ECC) && !defined(WOLFSSL_STATIC_RSA) \
&& !defined(WOLFSSL_STATIC_DH) && !defined(WOLFSSL_STATIC_PSK) \
&& !defined(HAVE_CURVE25519) && !defined(HAVE_CURVE448) \
&& defined(NO_RSA)
&& !defined(HAVE_CURVE25519) && !defined(HAVE_CURVE448)
#error "No cipher suites defined because DH disabled, ECC disabled, " \
"RSA disabled and no static suites defined. " \
"Please see top of README"
"and no static suites defined. Please see top of README"
#endif
#ifdef WOLFSSL_CERT_GEN
/* need access to Cert struct for creating certificate */