lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-12-12 15:41:16 +03:00
Code Activity

server: split dh_handsake_server

Browse Source
This commit is contained in:
Aris Adamantiadis
2011-09-17 13:20:04 +02:00
parent af09313eac
commit 09b33b1b6e
2 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/libssh/priv.h
View File

@@ -139,6 +139,7 @@ struct ssh_kex_struct;
SSH_PACKET_CALLBACK(ssh_packet_disconnect_callback); SSH_PACKET_CALLBACK(ssh_packet_disconnect_callback);
SSH_PACKET_CALLBACK(ssh_packet_ignore_callback); SSH_PACKET_CALLBACK(ssh_packet_ignore_callback);
int ssh_get_key_params(ssh_session session, ssh_key *privkey);
/* client.c */ /* client.c */

73
src/server.c
View File

@@ -169,13 +169,48 @@ SSH_PACKET_CALLBACK(ssh_packet_kexdh_init){
return SSH_PACKET_USED; return SSH_PACKET_USED;
} }
static int dh_handshake_server(ssh_session session) { int ssh_get_key_params(ssh_session session, ssh_key *privkey){
ssh_key pubkey; ssh_key pubkey;
ssh_key privkey = NULL; ssh_string pubkey_blob;
ssh_string pubkey_blob = NULL; int rc;
switch(session->srv.hostkey) {
case SSH_KEYTYPE_DSS:
*privkey = session->srv.dsa_key;
break;
case SSH_KEYTYPE_RSA:
case SSH_KEYTYPE_RSA1:
*privkey = session->srv.rsa_key;
break;
case SSH_KEYTYPE_ECDSA:
case SSH_KEYTYPE_UNKNOWN:
*privkey = NULL;
}
rc = ssh_pki_export_privkey_to_pubkey(*privkey, &pubkey);
if (rc < 0) {
ssh_set_error(session, SSH_FATAL,
"Could not get the public key from the private key");
return -1;
}
rc = ssh_pki_export_pubkey_blob(pubkey, &pubkey_blob);
ssh_key_free(pubkey);
if (rc < 0) {
ssh_set_error_oom(session);
return -1;
}
dh_import_pubkey(session, pubkey_blob);
return SSH_OK;
}
static int dh_handshake_server(ssh_session session) {
ssh_key privkey;
//ssh_string pubkey_blob = NULL;
ssh_string sig_blob; ssh_string sig_blob;
ssh_string f; ssh_string f;
int rc;
if (dh_generate_y(session) < 0) { if (dh_generate_y(session) < 0) {
ssh_set_error(session, SSH_FATAL, "Could not create y number"); ssh_set_error(session, SSH_FATAL, "Could not create y number");
@@ -192,36 +227,11 @@ static int dh_handshake_server(ssh_session session) {
return -1; return -1;
} }
switch(session->srv.hostkey) { if (ssh_get_key_params(session,&privkey) != SSH_OK){
case SSH_KEYTYPE_DSS:
privkey = session->srv.dsa_key;
break;
case SSH_KEYTYPE_RSA:
case SSH_KEYTYPE_RSA1:
privkey = session->srv.rsa_key;
break;
case SSH_KEYTYPE_ECDSA:
case SSH_KEYTYPE_UNKNOWN:
privkey = NULL;
}
rc = ssh_pki_export_privkey_to_pubkey(privkey, &pubkey);
if (rc < 0) {
ssh_set_error(session, SSH_FATAL,
"Could not get the public key from the private key");
ssh_string_free(f); ssh_string_free(f);
return -1; return -1;
} }
rc = ssh_pki_export_pubkey_blob(pubkey, &pubkey_blob);
ssh_key_free(pubkey);
if (rc < 0) {
ssh_set_error_oom(session);
ssh_string_free(f);
return -1;
}
dh_import_pubkey(session, pubkey_blob);
if (dh_build_k(session) < 0) { if (dh_build_k(session) < 0) {
ssh_set_error(session, SSH_FATAL, "Could not import the public key"); ssh_set_error(session, SSH_FATAL, "Could not import the public key");
ssh_string_free(f); ssh_string_free(f);
@@ -252,7 +262,8 @@ static int dh_handshake_server(ssh_session session) {
} }
if (buffer_add_u8(session->out_buffer, SSH2_MSG_KEXDH_REPLY) < 0 || if (buffer_add_u8(session->out_buffer, SSH2_MSG_KEXDH_REPLY) < 0 ||
buffer_add_ssh_string(session->out_buffer, pubkey_blob) < 0 || buffer_add_ssh_string(session->out_buffer,
session->next_crypto->server_pubkey) < 0 ||
buffer_add_ssh_string(session->out_buffer, f) < 0 || buffer_add_ssh_string(session->out_buffer, f) < 0 ||
buffer_add_ssh_string(session->out_buffer, sig_blob) < 0) { buffer_add_ssh_string(session->out_buffer, sig_blob) < 0) {
ssh_set_error(session, SSH_FATAL, "Not enough space"); ssh_set_error(session, SSH_FATAL, "Not enough space");