Skip to content

Commit 20f992a

Browse files
Merge pull request #6809 from SparkiDev/static_rsa_len_check_fix
Static RSA length check
2 parents 79a6cbc + 9acba6e commit 20f992a

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

src/internal.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38222,6 +38222,7 @@ static int DefTicketEncCb(WOLFSSL* ssl, byte key_name[WOLFSSL_TICKET_NAME_SZ],
3822238222
case rsa_kea:
3822338223
{
3822438224
RsaKey* key = (RsaKey*)ssl->hsKey;
38225+
int lenErrMask;
3822538226

3822638227
ret = RsaDec(ssl,
3822738228
input + args->idx,
@@ -38247,7 +38248,9 @@ static int DefTicketEncCb(WOLFSSL* ssl, byte key_name[WOLFSSL_TICKET_NAME_SZ],
3824738248
if (ret == BAD_FUNC_ARG)
3824838249
goto exit_dcke;
3824938250

38250-
args->lastErr = ret - (SECRET_LEN - args->sigSz);
38251+
lenErrMask = 0 - (SECRET_LEN != args->sigSz);
38252+
args->lastErr = (ret & (~lenErrMask)) |
38253+
(RSA_PAD_E & lenErrMask);
3825138254
ret = 0;
3825238255
break;
3825338256
} /* rsa_kea */

src/ssl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32840,7 +32840,7 @@ int wolfSSL_set_alpn_protos(WOLFSSL* ssl,
3284032840
const unsigned char* p, unsigned int p_len)
3284132841
{
3284232842
WOLFSSL_BIO* bio;
32843-
char* pt;
32843+
char* pt = NULL;
3284432844

3284532845
unsigned int sz;
3284632846
unsigned int idx = 0;

0 commit comments

Comments
 (0)