shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 09:54:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

dh: Rename variables for DH key exchange

Browse Source 
Rename and refactor how some variables are held in ssh_crypto_struct.
Refactor allocation of dh exchange public keys.

This is in preparation for switching the code to use openssl native DH
handling and allowed to better reason about the code and the overall API.

Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Simo Sorce
2019-03-12 18:24:36 -04:00
committed by Andreas Schneider
parent 997fe4d418
commit 2f38af1559
11 changed files with 195 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/kex.c
View File

@@ -1123,8 +1123,8 @@ int ssh_make_sessionid(ssh_session session)
case SSH_KEX_DH_GROUP18_SHA512:
rc = ssh_buffer_pack(buf,
"BB",
session->next_crypto->e,
session->next_crypto->f);
session->next_crypto->dh_ctx->client.pub_key,
session->next_crypto->dh_ctx->server.pub_key);
if (rc != SSH_OK) {
goto error;
}
@@ -1137,10 +1137,10 @@ int ssh_make_sessionid(ssh_session session)
session->next_crypto->dh_pmin,
session->next_crypto->dh_pn,
session->next_crypto->dh_pmax,
session->next_crypto->p,
session->next_crypto->g,
session->next_crypto->e,
session->next_crypto->f);
session->next_crypto->dh_ctx->modulus,
session->next_crypto->dh_ctx->generator,
session->next_crypto->dh_ctx->client.pub_key,
session->next_crypto->dh_ctx->server.pub_key);
if (rc != SSH_OK) {
goto error;
}
@@ -1180,7 +1180,7 @@ int ssh_make_sessionid(ssh_session session)
break;
#endif
}
rc = ssh_buffer_pack(buf, "B", session->next_crypto->k);
rc = ssh_buffer_pack(buf, "B", session->next_crypto->shared_secret);
if (rc != SSH_OK) {
goto error;
}
@@ -1365,7 +1365,7 @@ int ssh_generate_session_keys(ssh_session session)
size_t intkey_srv_to_cli_len = 0;
int rc = -1;
k_string = ssh_make_bignum_string(crypto->k);
k_string = ssh_make_bignum_string(crypto->shared_secret);
if (k_string == NULL) {
ssh_set_error_oom(session);
goto error;