Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

plugins: sshd: mbedtls 3 extra adaptation

Browse source 
In fresh mbedtls rsa public decrypt is deprecated and not work on public keys.
Replaced by lws_genrsa_hash_sig_verify.
This commit is contained in:
Orefkov Aleksander 2021-10-19 02:01:59 +03:00 • committed by Andy Green
parent 9efc32ab49
commit 957bfae5c8
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plugins/ssh-base/sshd.c
View file

@ -533,7 +533,10 @@ lws_ssh_parse_plaintext(struct per_session_data__sshd *pss, uint8_t *p, size_t l
struct lws_genrsa_ctx ctx;
struct lws_ssh_channel *ch;
struct lws_subprotocol_scp *scp;
uint8_t *pp, *ps, hash[64], *otmp;
uint8_t *pp, *ps, hash[64];
#if !defined(MBEDTLS_VERSION_NUMBER) || MBEDTLS_VERSION_NUMBER < 0x03000000
uint8_t *otmp = NULL;
#endif
uint32_t m;
int n;
@ -1256,6 +1259,7 @@ again:
m = lws_g32(&pp);
pp += m;
m = lws_g32(&pp);
#if !defined(MBEDTLS_VERSION_NUMBER) || MBEDTLS_VERSION_NUMBER < 0x03000000
/*
* decrypt it, resulting in an error, or some ASN1
@ -1290,6 +1294,12 @@ again:
}
free(otmp);
#else
ctx.ctx->MBEDTLS_PRIVATE(len) = m;
n = lws_genrsa_hash_sig_verify(&ctx, hash,
(enum lws_genhash_types)rsa_hash_alg_from_ident(pss->ua->alg),
pp, m) == 0 ? 1 : 0;
#endif
lws_genrsa_destroy(&ctx);
/*
@ -1822,7 +1832,9 @@ ch_fail:
pss->parser_state = SSH_KEX_STATE_SKIP;
break;
#if !defined(MBEDTLS_VERSION_NUMBER) || MBEDTLS_VERSION_NUMBER < 0x03000000
ua_fail1:
#endif
lws_genrsa_destroy(&ctx);
ua_fail:
write_task(pss, NULL, SSH_WT_UA_FAILURE);