From d46fe6a51c0e18a3d23e05c7cc81186acc319271 Mon Sep 17 00:00:00 2001
From: Aris Adamantiadis <aris@0xbadc0de.be>
Date: Fri, 25 Sep 2015 08:52:38 +0200
Subject: [PATCH] SSH1: fix duplicate identifier

---
 include/libssh/crypto.h | 2 +-
 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;
     }