diff options
author | Aris Adamantiadis <aris@0xbadc0de.be> | 2015-09-25 08:52:38 +0200 |
---|---|---|
committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2015-09-25 08:52:38 +0200 |
commit | d46fe6a51c0e18a3d23e05c7cc81186acc319271 (patch) | |
tree | 296c861204fccd0ce046339b8915dba1184753f2 | |
parent | e83b4e8129811f8075c6ab4b3ee700fd0c92ffa7 (diff) | |
download | libssh-d46fe6a51c0e18a3d23e05c7cc81186acc319271.tar.gz libssh-d46fe6a51c0e18a3d23e05c7cc81186acc319271.tar.xz libssh-d46fe6a51c0e18a3d23e05c7cc81186acc319271.zip |
SSH1: fix duplicate identifier
-rw-r--r-- | include/libssh/crypto.h | 2 | ||||
-rw-r--r-- | src/libcrypto.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/libssh/crypto.h b/include/libssh/crypto.h index 2e866467..eed93710 100644 --- a/include/libssh/crypto.h +++ b/include/libssh/crypto.h @@ -60,7 +60,7 @@ enum ssh_key_exchange_e { }; enum ssh_cipher_e { - SSH_CIPHER_NONE=0, + SSH_NO_CIPHER=0, SSH_BLOWFISH_CBC, SSH_3DES_CBC, SSH_3DES_CBC_SSH1, diff --git a/src/libcrypto.c b/src/libcrypto.c index eb3c1250..4524628b 100644 --- a/src/libcrypto.c +++ b/src/libcrypto.c @@ -458,7 +458,7 @@ static void evp_cipher_init(struct ssh_cipher_struct *cipher) { case SSH_DES_CBC_SSH1: SSH_LOG(SSH_LOG_WARNING, "This cipher should not use evp_cipher_init"); break; - case SSH_CIPHER_NONE: + case SSH_NO_CIPHER: SSH_LOG(SSH_LOG_WARNING, "No valid ciphertype found"); break; } |