From 551188d99b40aa70429565a038634023d5820145 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Wed, 19 Jun 2019 16:04:00 +0200 Subject: [PATCH] pki: Reformat pki_privatekey_type_from_string() Signed-off-by: Jakub Jelen Reviewed-by: Anderson Toshiyuki Sasaki (cherry picked from commit 23c837f4d00a71c1737fa6038226c9d246bbed2f) --- src/pki.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/pki.c b/src/pki.c index 62d7de41..2a94ade9 100644 --- a/src/pki.c +++ b/src/pki.c @@ -64,16 +64,22 @@ #include "libssh/misc.h" #include "libssh/agent.h" -enum ssh_keytypes_e pki_privatekey_type_from_string(const char *privkey) { - if (strncmp(privkey, DSA_HEADER_BEGIN, strlen(DSA_HEADER_BEGIN)) == 0) { +enum ssh_keytypes_e pki_privatekey_type_from_string(const char *privkey) +{ + int cmp; + + cmp = strncmp(privkey, DSA_HEADER_BEGIN, strlen(DSA_HEADER_BEGIN)); + if (cmp == 0) { return SSH_KEYTYPE_DSS; } - if (strncmp(privkey, RSA_HEADER_BEGIN, strlen(RSA_HEADER_BEGIN)) == 0) { + cmp = strncmp(privkey, RSA_HEADER_BEGIN, strlen(RSA_HEADER_BEGIN)); + if (cmp == 0) { return SSH_KEYTYPE_RSA; } - if (strncmp(privkey, ECDSA_HEADER_BEGIN, strlen(ECDSA_HEADER_BEGIN)) == 0) { + cmp = strncmp(privkey, ECDSA_HEADER_BEGIN, strlen(ECDSA_HEADER_BEGIN)); + if (cmp == 0) { /* We don't know what the curve is at this point, so we don't actually * know the type. We figure out the actual curve and fix things up in * pki_private_key_from_base64 */