curve25519: fix uninitialized arg to EVP_PKEY_derive
Ensure that the `keylen` argument as provided to `EVP_PKEY_derive` is initialized, otherwise depending on stack contents, the function call may fail. Fixes T205. Signed-off-by: Jon Simons <jon@jonsimons.org> Reviewed-by: Jakub Jelen <jjelen@redhat.com>
Этот коммит содержится в:
родитель
d2a32ca6d3
Коммит
b94ecf18bd
@ -179,7 +179,7 @@ static int ssh_curve25519_build_k(ssh_session session)
|
|||||||
#ifdef HAVE_OPENSSL_X25519
|
#ifdef HAVE_OPENSSL_X25519
|
||||||
EVP_PKEY_CTX *pctx = NULL;
|
EVP_PKEY_CTX *pctx = NULL;
|
||||||
EVP_PKEY *pkey = NULL, *pubkey = NULL;
|
EVP_PKEY *pkey = NULL, *pubkey = NULL;
|
||||||
size_t shared_key_len;
|
size_t shared_key_len = sizeof(k);
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
pkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_X25519, NULL,
|
pkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_X25519, NULL,
|
||||||
@ -240,9 +240,7 @@ static int ssh_curve25519_build_k(ssh_session session)
|
|||||||
return SSH_ERROR;
|
return SSH_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
rc = EVP_PKEY_derive(pctx,
|
rc = EVP_PKEY_derive(pctx, k, &shared_key_len);
|
||||||
k,
|
|
||||||
&shared_key_len);
|
|
||||||
if (rc != 1) {
|
if (rc != 1) {
|
||||||
SSH_LOG(SSH_LOG_TRACE,
|
SSH_LOG(SSH_LOG_TRACE,
|
||||||
"Failed to derive X25519 shared secret: %s",
|
"Failed to derive X25519 shared secret: %s",
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user