[openssh-commits] [openssh] 01/01: Skip ssh1 specfic ciphers.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit d924640d4c355d1b5eca1f4cc60146a9975dbbff
Author: Darren Tucker <dtucker at zip.com.au>
Date:   Fri Oct 28 13:38:19 2016 +1100

    Skip ssh1 specfic ciphers.
    
    cipher-3des1.c and cipher-bf1.c are specific to sshv1 so don't even try
    to compile them when Protocol 1 is not enabled.
---
 cipher-3des1.c | 3 +++
 cipher-bf1.c   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/cipher-3des1.c b/cipher-3des1.c
index 6a0f1f3..9fcc278 100644
--- a/cipher-3des1.c
+++ b/cipher-3des1.c
@@ -20,6 +20,8 @@
 
 #include "includes.h"
 
+#ifdef WITH_SSH1
+
 #include <sys/types.h>
 #include <string.h>
 #include <openssl/evp.h>
@@ -153,3 +155,4 @@ evp_ssh1_3des(void)
 	ssh1_3des.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH;
 	return &ssh1_3des;
 }
+#endif /* WITH_SSH1 */
diff --git a/cipher-bf1.c b/cipher-bf1.c
index 7d51f51..c205b07 100644
--- a/cipher-bf1.c
+++ b/cipher-bf1.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 
+#ifdef WITH_SSH1
 #if defined(WITH_OPENSSL) && !defined(OPENSSL_NO_BF)
 
 #include <sys/types.h>
@@ -101,3 +102,5 @@ evp_ssh1_bf(void)
 	return (&ssh1_bf);
 }
 #endif /* defined(WITH_OPENSSL) && !defined(OPENSSL_NO_BF) */
+
+#endif /* WITH_SSH1 */

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.