lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-30 13:01:23 +03:00
Code Activity

client: Migrate to new signature pki.

Browse Source
This commit is contained in:
Andreas Schneider
2011-08-22 18:20:54 +02:00
parent 8c8a91a9b7
commit 8edf57fbf2
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/client.c
View File

@@ -39,6 +39,7 @@
#include "libssh/ecdh.h" #include "libssh/ecdh.h"
#include "libssh/threads.h" #include "libssh/threads.h"
#include "libssh/misc.h" #include "libssh/misc.h"
#include "libssh/pki.h"
#define set_status(session, status) do {\ #define set_status(session, status) do {\
if (session->common.callbacks && session->common.callbacks->connect_status_function) \ if (session->common.callbacks && session->common.callbacks->connect_status_function) \
@@ -211,7 +212,7 @@ error:
} }
SSH_PACKET_CALLBACK(ssh_packet_newkeys){ SSH_PACKET_CALLBACK(ssh_packet_newkeys){
ssh_string signature = NULL; ssh_string sig_blob = NULL;
int rc; int rc;
(void)packet; (void)packet;
(void)user; (void)user;
@@ -246,16 +247,19 @@ SSH_PACKET_CALLBACK(ssh_packet_newkeys){
} }
/* Verify the host's signature. FIXME do it sooner */ /* Verify the host's signature. FIXME do it sooner */
signature = session->next_crypto->dh_server_signature; sig_blob = session->next_crypto->dh_server_signature;
session->next_crypto->dh_server_signature = NULL; session->next_crypto->dh_server_signature = NULL;
if (signature_verify(session, signature)) { rc = ssh_pki_signature_verify_blob(session,
sig_blob);
if (rc == SSH_ERROR) {
goto error; goto error;
} }
ssh_log(session,SSH_LOG_PROTOCOL,"Signature verified and valid"); ssh_log(session,SSH_LOG_PROTOCOL,"Signature verified and valid");
/* forget it for now ... */ /* forget it for now ... */
ssh_string_burn(signature); ssh_string_burn(sig_blob);
ssh_string_free(signature); ssh_string_free(sig_blob);
signature=NULL; sig_blob = NULL;
/* /*
* Once we got SSH2_MSG_NEWKEYS we can switch next_crypto and * Once we got SSH2_MSG_NEWKEYS we can switch next_crypto and
* current_crypto * current_crypto