From 2be90be7409219efa3577ac97c56f47a4d664fd8 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 15 Jun 2011 10:30:38 +0200 Subject: known_hosts: Added a log message for key type mismatch. --- src/known_hosts.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/known_hosts.c b/src/known_hosts.c index 7c935a8..7ec73de 100644 --- a/src/known_hosts.c +++ b/src/known_hosts.c @@ -474,6 +474,12 @@ int ssh_is_server_known(ssh_session session) { if (match) { /* We got a match. Now check the key type */ if (strcmp(session->current_crypto->server_pubkey_type, type) != 0) { + ssh_log(session, + SSH_LOG_PACKET, + "ssh_is_server_known: server type [%s] doesn't match the " + "type [%s] in known_hosts file", + session->current_crypto->server_pubkey_type, + type); /* Different type. We don't override the known_changed error which is * more important */ if (ret != SSH_SERVER_KNOWN_CHANGED) -- cgit From 27cedaa0b6705d01a99dfe2b072f59b1fe1fb198 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 14 Jun 2011 22:33:58 +0200 Subject: pki: Make ssh_key_is_public() a public function. --- src/pki.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src') diff --git a/src/pki.c b/src/pki.c index fe3b13b..52672db 100644 --- a/src/pki.c +++ b/src/pki.c @@ -150,6 +150,21 @@ enum ssh_keytypes_e ssh_key_type_from_name(const char *name) { return SSH_KEYTYPE_UNKNOWN; } +/** + * @brief Check if the key has/is a public key. + * + * @param[in] k The key to check. + * + * @return 1 if it is a public key, 0 if not. + */ +int ssh_key_is_public(ssh_key k) { + if (k == NULL) { + return 0; + } + + return (k->flags & SSH_KEY_FLAG_PUBLIC); +} + /** * @brief import a key from a file * @param[out] key the ssh_key to update -- cgit From c75581fb939e5be9ea51c1741e57b75626da03a3 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 14 Jun 2011 22:37:00 +0200 Subject: pki: Make ssh_key_is_private() a public function. --- src/pki.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src') diff --git a/src/pki.c b/src/pki.c index 52672db..fd30ee4 100644 --- a/src/pki.c +++ b/src/pki.c @@ -165,6 +165,21 @@ int ssh_key_is_public(ssh_key k) { return (k->flags & SSH_KEY_FLAG_PUBLIC); } +/** + * @brief Check if the key is a private key. + * + * @param[in] k The key to check. + * + * @return 1 if it is a private key, 0 if not. + */ +int ssh_key_is_private(ssh_key k) { + if (k == NULL) { + return 0; + } + + return (k->flags & SSH_KEY_FLAG_PRIVATE); +} + /** * @brief import a key from a file * @param[out] key the ssh_key to update -- cgit