diff options
author | Aris Adamantiadis <aris@0xbadc0de.be> | 2015-02-02 21:29:44 +0100 |
---|---|---|
committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2015-02-03 09:58:28 +0100 |
commit | 760d93e87b28f231ae21dd5062ed6f318291d10a (patch) | |
tree | da85b910c2a52b08ac0670bd36ef5082b642c394 | |
parent | d42a1a35b0c2f2178e459b9328f97f9e988a1cb0 (diff) | |
download | libssh-760d93e87b28f231ae21dd5062ed6f318291d10a.tar.gz libssh-760d93e87b28f231ae21dd5062ed6f318291d10a.tar.xz libssh-760d93e87b28f231ae21dd5062ed6f318291d10a.zip |
Revert "pki_gcrypt: fix warnings for SSH_KEYTYPE_ED25519"
This reverts commit 10f71c67690cf3c0e1b6a733c3641407df2224e2.
Commit was redundant with ed25519 branch
-rw-r--r-- | src/pki_gcrypt.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/pki_gcrypt.c b/src/pki_gcrypt.c index 42159175..757a0375 100644 --- a/src/pki_gcrypt.c +++ b/src/pki_gcrypt.c @@ -669,7 +669,6 @@ ssh_key pki_private_key_from_base64(const char *b64_key, case SSH_KEYTYPE_ED25519: /* Cannot open ed25519 keys with libgcrypt */ case SSH_KEYTYPE_ECDSA: - case SSH_KEYTYPE_ED25519: case SSH_KEYTYPE_UNKNOWN: default: ssh_pki_log("Unkown or invalid private key type %d", type); @@ -976,7 +975,6 @@ ssh_key pki_key_dup(const ssh_key key, int demote) break; case SSH_KEYTYPE_ECDSA: - case SSH_KEYTYPE_ED25519: case SSH_KEYTYPE_UNKNOWN: default: ssh_key_free(new); @@ -1137,7 +1135,6 @@ int pki_key_compare(const ssh_key k1, /* ed25519 keys handled globaly */ return 0; case SSH_KEYTYPE_ECDSA: - case SSH_KEYTYPE_ED25519: case SSH_KEYTYPE_UNKNOWN: return 1; } @@ -1296,7 +1293,6 @@ ssh_string pki_publickey_to_blob(const ssh_key key) } break; case SSH_KEYTYPE_ECDSA: - case SSH_KEYTYPE_ED25519: case SSH_KEYTYPE_UNKNOWN: default: goto fail; @@ -1463,7 +1459,6 @@ ssh_string pki_signature_to_blob(const ssh_signature sig) sig_blob = pki_ed25519_sig_to_blob(sig); break; case SSH_KEYTYPE_ECDSA: - case SSH_KEYTYPE_ED25519: case SSH_KEYTYPE_UNKNOWN: default: ssh_pki_log("Unknown signature key type: %d", sig->type); @@ -1559,7 +1554,6 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey, } break; case SSH_KEYTYPE_ECDSA: - case SSH_KEYTYPE_ED25519: case SSH_KEYTYPE_UNKNOWN: default: ssh_pki_log("Unknown signature type"); @@ -1643,7 +1637,6 @@ int pki_signature_verify(ssh_session session, } break; case SSH_KEYTYPE_ECDSA: - case SSH_KEYTYPE_ED25519: case SSH_KEYTYPE_UNKNOWN: default: ssh_set_error(session, SSH_FATAL, "Unknown public key type"); @@ -1717,7 +1710,6 @@ ssh_signature pki_do_sign(const ssh_key privkey, } break; case SSH_KEYTYPE_ECDSA: - case SSH_KEYTYPE_ED25519: case SSH_KEYTYPE_UNKNOWN: default: ssh_signature_free(sig); @@ -1787,7 +1779,6 @@ ssh_signature pki_do_sign_sessionid(const ssh_key key, case SSH_KEYTYPE_ED25519: /* ED25519 handled in caller */ case SSH_KEYTYPE_ECDSA: - case SSH_KEYTYPE_ED25519: case SSH_KEYTYPE_UNKNOWN: default: return NULL; |