diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2012-09-25 15:29:38 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2012-09-25 15:29:38 +0200 |
commit | d0889dd9eabf443eaef57d7ade704bc5e28c0f41 (patch) | |
tree | 597a781f0892859434aecdbb9daf0c903307c960 /src | |
parent | 3c5235fdc0c398dbb21d6a15dd4fb47229f3b1aa (diff) | |
download | libssh-d0889dd9eabf443eaef57d7ade704bc5e28c0f41.tar.gz libssh-d0889dd9eabf443eaef57d7ade704bc5e28c0f41.tar.xz libssh-d0889dd9eabf443eaef57d7ade704bc5e28c0f41.zip |
kex: Fix simpledes with gcrypt.
Diffstat (limited to 'src')
-rw-r--r-- | src/kex.c | 42 |
1 files changed, 21 insertions, 21 deletions
@@ -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 |