diff options
author | Jakub Jelen <jjelen@redhat.com> | 2019-06-19 16:04:00 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2019-06-24 15:41:56 +0200 |
commit | 551188d99b40aa70429565a038634023d5820145 (patch) | |
tree | c2d3019dfd94f13283c7e4087905ba258f69b17b | |
parent | cafafe8f5a74a373d4b8694617d6a7d529ecf9f7 (diff) | |
download | libssh-551188d99b40aa70429565a038634023d5820145.tar.gz libssh-551188d99b40aa70429565a038634023d5820145.tar.xz libssh-551188d99b40aa70429565a038634023d5820145.zip |
pki: Reformat pki_privatekey_type_from_string()
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
(cherry picked from commit 23c837f4d00a71c1737fa6038226c9d246bbed2f)
-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 */ |