From d0889dd9eabf443eaef57d7ade704bc5e28c0f41 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 25 Sep 2012 15:29:38 +0200
Subject: [PATCH] kex: Fix simpledes with gcrypt.

---
 src/kex.c | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/kex.c b/src/kex.c
index f2b5a939..029319f3 100644
--- a/src/kex.c
+++ b/src/kex.c
@@ -36,27 +36,27 @@
 #include "libssh/string.h"
 
 #ifdef HAVE_LIBGCRYPT
-#define BLOWFISH "blowfish-cbc,"
-#define AES "aes256-ctr,aes192-ctr,aes128-ctr,aes256-cbc,aes192-cbc,aes128-cbc,"
-#define DES "3des-cbc"
-#elif defined HAVE_LIBCRYPTO
-#ifdef HAVE_OPENSSL_BLOWFISH_H
-#define BLOWFISH "blowfish-cbc,"
-#else
-#define BLOWFISH ""
-#endif
-#ifdef HAVE_OPENSSL_AES_H
-#ifdef BROKEN_AES_CTR
-#define AES "aes256-cbc,aes192-cbc,aes128-cbc,"
-#else
-#define AES "aes256-ctr,aes192-ctr,aes128-ctr,aes256-cbc,aes192-cbc,aes128-cbc,"
-#endif /* BROKEN_AES_CTR */
-#else
-#define AES ""
-#endif
-
-#define DES "3des-cbc"
-#define SIMPLEDES "des-cbc-ssh1"
+# define BLOWFISH "blowfish-cbc,"
+# define AES "aes256-ctr,aes192-ctr,aes128-ctr,aes256-cbc,aes192-cbc,aes128-cbc,"
+# define DES "3des-cbc"
+# define SIMPLEDES "des-cbc-ssh1"
+#elif defined(HAVE_LIBCRYPTO)
+# ifdef HAVE_OPENSSL_BLOWFISH_H
+#  define BLOWFISH "blowfish-cbc,"
+# else
+#  define BLOWFISH ""
+# endif
+# ifdef HAVE_OPENSSL_AES_H
+#  ifdef BROKEN_AES_CTR
+#   define AES "aes256-cbc,aes192-cbc,aes128-cbc,"
+#  else
+#   define AES "aes256-ctr,aes192-ctr,aes128-ctr,aes256-cbc,aes192-cbc,aes128-cbc,"
+#  endif /* BROKEN_AES_CTR */
+# else
+#  define AES ""
+#  endif
+# define DES "3des-cbc"
+# define SIMPLEDES "des-cbc-ssh1"
 #endif
 
 #ifdef WITH_ZLIB