diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2012-10-07 12:01:34 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2012-10-07 12:03:54 +0200 |
| commit | ecd2ee95e7024fcb93a8f3133f3eb335075e47e5 (patch) | |
| tree | 5c362dc0805d0f373f3c6e0d8e8a9bf8b93f5e08 /src/kex.c | |
| parent | c81010e2f7e560081d78d15e54789af45c0a4999 (diff) | |
| download | libssh-ecd2ee95e7024fcb93a8f3133f3eb335075e47e5.tar.gz libssh-ecd2ee95e7024fcb93a8f3133f3eb335075e47e5.tar.xz libssh-ecd2ee95e7024fcb93a8f3133f3eb335075e47e5.zip | |
kex: Fix supported methods index.
Diffstat (limited to 'src/kex.c')
| -rw-r--r-- | src/kex.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -38,8 +38,7 @@ #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" -# define SIMPLEDES "des-cbc-ssh1" +# define DES "3des-cbc,des-cbc-ssh1" #elif defined(HAVE_LIBCRYPTO) # ifdef HAVE_OPENSSL_BLOWFISH_H # define BLOWFISH "blowfish-cbc," @@ -55,8 +54,7 @@ # else # define AES "" # endif -# define DES "3des-cbc" -# define SIMPLEDES "des-cbc-ssh1" +# define DES "3des-cbc,des-cbc-ssh1" #endif #ifdef WITH_ZLIB @@ -75,6 +73,7 @@ #define KEX_METHODS_SIZE 10 +/* NOTE: This is a fixed API and the index is defined by ssh_kex_types_e */ static const char *default_methods[] = { KEY_EXCHANGE, HOSTKEYS, @@ -89,12 +88,12 @@ static const char *default_methods[] = { NULL }; +/* NOTE: This is a fixed API and the index is defined by ssh_kex_types_e */ const char *supported_methods[] = { KEY_EXCHANGE, HOSTKEYS, AES BLOWFISH DES, AES BLOWFISH DES, - SIMPLEDES, "hmac-sha1", "hmac-sha1", ZLIB, |