diff options
author | Jakub Jelen <jjelen@redhat.com> | 2020-04-28 11:04:59 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2020-05-05 14:23:06 +0200 |
commit | e6aee24a1e3be68417e1ac4ab4a02c65bf9db637 (patch) | |
tree | 02ec3d0ee6fb0313ddc23410da2301098ab04b0e /src/kex.c | |
parent | 46499b1b9090b1e5d6a7d84998bc23ed71b3cf9c (diff) | |
download | libssh-e6aee24a1e3be68417e1ac4ab4a02c65bf9db637.tar.gz libssh-e6aee24a1e3be68417e1ac4ab4a02c65bf9db637.tar.xz libssh-e6aee24a1e3be68417e1ac4ab4a02c65bf9db637.zip |
Add basic support for none cipher and MACs
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'src/kex.c')
-rw-r--r-- | src/kex.c | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -125,6 +125,12 @@ #define DSA_PUBLIC_KEY_ALGORITHMS "" #endif +#ifdef WITH_INSECURE_NONE +#define NONE ",none" +#else +#define NONE +#endif + #define HOSTKEYS "ssh-ed25519," \ EC_HOSTKEYS \ "rsa-sha2-512," \ @@ -239,10 +245,10 @@ static const char *default_methods[] = { static const char *supported_methods[] = { KEY_EXCHANGE_SUPPORTED, PUBLIC_KEY_ALGORITHMS, - CHACHA20 AES BLOWFISH DES_SUPPORTED, - CHACHA20 AES BLOWFISH DES_SUPPORTED, - "hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha1-etm@openssh.com,hmac-sha2-256,hmac-sha2-512,hmac-sha1", - "hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha1-etm@openssh.com,hmac-sha2-256,hmac-sha2-512,hmac-sha1", + CHACHA20 AES BLOWFISH DES_SUPPORTED NONE, + CHACHA20 AES BLOWFISH DES_SUPPORTED NONE, + "hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha1-etm@openssh.com,hmac-sha2-256,hmac-sha2-512,hmac-sha1" NONE, + "hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha1-etm@openssh.com,hmac-sha2-256,hmac-sha2-512,hmac-sha1" NONE, ZLIB, ZLIB, "", |