diff options
author | Jakub Jelen <jjelen@redhat.com> | 2019-06-19 16:04:00 +0200 |
---|---|---|
committer | Jakub Jelen <jjelen@redhat.com> | 2019-06-19 18:01:32 +0200 |
commit | 23c837f4d00a71c1737fa6038226c9d246bbed2f (patch) | |
tree | 06f8b04002e829dfd6d87d3189fb614d7de75582 /src/pki.c | |
parent | bd69ac63ca455b08ffc5093be34b2dd232f3187a (diff) | |
download | libssh-23c837f4d00a71c1737fa6038226c9d246bbed2f.tar.gz libssh-23c837f4d00a71c1737fa6038226c9d246bbed2f.tar.xz libssh-23c837f4d00a71c1737fa6038226c9d246bbed2f.zip |
pki: Reformat pki_privatekey_type_from_string()
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Diffstat (limited to 'src/pki.c')
-rw-r--r-- | src/pki.c | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -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 */ |