aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelen <jjelen@redhat.com>2019-01-08 11:32:10 +0100
committerAndreas Schneider <asn@cryptomilk.org>2019-01-09 17:22:45 +0100
commitd028b2495d0bb2b7ae9b0af42b4377af4a964b00 (patch)
treeb5f2c8db4725493cdf8ec784589fde1592b9ebb5
parent68fc17caac6d87e7cfe4a89113127625c00b4dd5 (diff)
downloadlibssh-d028b2495d0bb2b7ae9b0af42b4377af4a964b00.tar.gz
libssh-d028b2495d0bb2b7ae9b0af42b4377af4a964b00.tar.xz
libssh-d028b2495d0bb2b7ae9b0af42b4377af4a964b00.zip
dh: Make sure we do not access uninitialized memory
Signed-off-by: Jakub Jelen <jjelen@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org> (cherry picked from commit ca62632170c311923026f978c57d2e0a0be3e0e1)
-rw-r--r--src/dh.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/dh.c b/src/dh.c
index 90c1813c..cc12fd46 100644
--- a/src/dh.c
+++ b/src/dh.c
@@ -1274,6 +1274,10 @@ int ssh_get_server_publickey(ssh_session session, ssh_key *key)
ssh_key ssh_dh_get_current_server_publickey(ssh_session session)
{
+ if (session->current_crypto == NULL) {
+ return NULL;
+ }
+
return session->current_crypto->server_pubkey;
}