From 35a4bcabf754fda3a493a2a2532ffc05796c0d6f Mon Sep 17 00:00:00 2001 From: Jan Mojzis Date: Thu, 11 Aug 2016 13:03:33 +0200 Subject: [PATCH] removed aes128 --- crypto-tests/crypto_core_aes128encrypttest.c | 116 ------------------- crypto/CRYPTOLIBS | 1 - crypto/CRYPTOPRIMITIVES | 1 - crypto/CRYPTOSOURCES | 1 - crypto/crypto_core_aes128encrypt.c | 14 --- crypto/crypto_core_aes128encrypt.h | 18 --- man/tinysshd.8 | 2 +- tinyssh/LIBS | 1 - tinyssh/SOURCES | 1 - tinyssh/sshcrypto.h | 4 +- tinyssh/sshcrypto_cipher.c | 15 +-- tinyssh/sshcrypto_cipher_aesctr128.c | 35 ------ tinyssh/tinysshd.exp | 96 +++++++-------- 13 files changed, 51 insertions(+), 254 deletions(-) delete mode 100644 crypto-tests/crypto_core_aes128encrypttest.c delete mode 100644 crypto/crypto_core_aes128encrypt.c delete mode 100644 crypto/crypto_core_aes128encrypt.h delete mode 100644 tinyssh/sshcrypto_cipher_aesctr128.c diff --git a/crypto-tests/crypto_core_aes128encrypttest.c b/crypto-tests/crypto_core_aes128encrypttest.c deleted file mode 100644 index eb8fefa..0000000 --- a/crypto-tests/crypto_core_aes128encrypttest.c +++ /dev/null @@ -1,116 +0,0 @@ -/* -20140709 -Jan Mojzis -Public domain. -*/ - -#include "misc.h" -#include "crypto_core_aes128encrypt.h" - -static unsigned char key[crypto_core_aes128encrypt_KEYBYTES + 16]; -static unsigned char out[crypto_core_aes128encrypt_OUTPUTBYTES + 16]; -static unsigned char in[crypto_core_aes128encrypt_INPUTBYTES + 16]; - -static unsigned char o[32] = { - 0xfb, 0x69, 0xd1, 0xae, 0xce, 0x0e, 0xa0, 0x89, - 0xfe, 0xe8, 0x07, 0xb2, 0xe1, 0x5b, 0xb3, 0xd4, - 0x1b, 0xa9, 0x73, 0x54, 0xca, 0x8f, 0x83, 0x6c, - 0x05, 0x51, 0x8b, 0x10, 0xe8, 0x81, 0x45, 0xc7 -}; - -static void test_alignment(void) { - - long long i; - - for (i = 0; i < 16; ++i) { - crypto_core_aes128encrypt(out + i, in + i, key + i, 0); - } -} - -static void test_rand(void) { - - long long i; - - for (i = 0; i < 256; ++i) { - pseudorandombytes(key, sizeof key); - pseudorandombytes(in, sizeof in); - crypto_core_aes128encrypt(out, in, key, 0); - checksum(out, crypto_core_aes128encrypt_OUTPUTBYTES); - } - fail_whenbadchecksum(o); -} - -/* NIST testvectors from Special Publication 800-38A */ -static struct vector { - const unsigned char key[crypto_core_aes128encrypt_KEYBYTES]; - const unsigned char in[crypto_core_aes128encrypt_INPUTBYTES]; - const unsigned char out[crypto_core_aes128encrypt_OUTPUTBYTES]; -} vectors[] = { - { - { - 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c - }, - { - 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff - }, - { - 0xec, 0x8c, 0xdf, 0x73, 0x98, 0x60, 0x7c, 0xb0, 0xf2, 0xd2, 0x16, 0x75, 0xea, 0x9e, 0xa1, 0xe4 - } - }, - { - { - 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c - }, - { - 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xff, 0x00 - }, - { - 0x36, 0x2b, 0x7c, 0x3c, 0x67, 0x73, 0x51, 0x63, 0x18, 0xa0, 0x77, 0xd7, 0xfc, 0x50, 0x73, 0xae - } - }, - { - { - 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c - }, - { - 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xff, 0x01 - }, - { - 0x6a, 0x2c, 0xc3, 0x78, 0x78, 0x89, 0x37, 0x4f, 0xbe, 0xb4, 0xc8, 0x1b, 0x17, 0xba, 0x6c, 0x44 - } - }, - { - { - 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c - }, - { - 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xff, 0x02 - }, - { - 0xe8, 0x9c, 0x39, 0x9f, 0xf0, 0xf1, 0x98, 0xc6, 0xd4, 0x0a, 0x31, 0xdb, 0x15, 0x6c, 0xab, 0xfe - } - }, - -}; - -static void test_vector(void) { - - long long i, j; - unsigned char out[crypto_core_aes128encrypt_OUTPUTBYTES]; - - for (i = 0; i < 4; ++i) { - crypto_core_aes128encrypt(out, vectors[i].in, vectors[i].key, 0); - for (j = 0; j < crypto_core_aes128encrypt_OUTPUTBYTES; ++j) - if (out[j] != vectors[i].out[j]) - fail("crypto_core_aes128encrypt() failure"); - } -} - -int main(void) { - - test_vector(); - test_alignment(); - test_rand(); - - _exit(0); -} diff --git a/crypto/CRYPTOLIBS b/crypto/CRYPTOLIBS index 94fb780..630f66f 100644 --- a/crypto/CRYPTOLIBS +++ b/crypto/CRYPTOLIBS @@ -1,6 +1,5 @@ crypto_onetimeauth_poly1305.o aes.o -crypto_core_aes128encrypt.o crypto_core_aes256encrypt.o randombytes.o uint32_pack.o diff --git a/crypto/CRYPTOPRIMITIVES b/crypto/CRYPTOPRIMITIVES index 81d7aff..b99dbb4 100644 --- a/crypto/CRYPTOPRIMITIVES +++ b/crypto/CRYPTOPRIMITIVES @@ -5,7 +5,6 @@ crypto_hash_sha512 1 crypto_hash_sha256 1 crypto_verify_16 1 crypto_verify_32 1 -crypto_core_aes128encrypt 1 crypto_core_aes256encrypt 1 crypto_scalarmult_curve25519 1 crypto_scalarmult_nistp256 1 diff --git a/crypto/CRYPTOSOURCES b/crypto/CRYPTOSOURCES index bfed42f..0b3b11e 100644 --- a/crypto/CRYPTOSOURCES +++ b/crypto/CRYPTOSOURCES @@ -1,6 +1,5 @@ crypto_onetimeauth_poly1305 aes -crypto_core_aes128encrypt crypto_core_aes256encrypt randombytes uint32_pack diff --git a/crypto/crypto_core_aes128encrypt.c b/crypto/crypto_core_aes128encrypt.c deleted file mode 100644 index 84a2c73..0000000 --- a/crypto/crypto_core_aes128encrypt.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "aes.h" -#include "cleanup.h" -#include "crypto_core_aes128encrypt.h" - -int crypto_core_aes128encrypt_tinynacl(unsigned char *out, const unsigned char *in, const unsigned char *k, const unsigned char *c) { - - unsigned char d[176]; - - aes_expandkey128(d, k); - aes_core(out, in, d, 10); - cleanup(d); - if (c) return -1; - return 0; -} diff --git a/crypto/crypto_core_aes128encrypt.h b/crypto/crypto_core_aes128encrypt.h deleted file mode 100644 index 0d89005..0000000 --- a/crypto/crypto_core_aes128encrypt.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef crypto_core_aes128encrypt_H -#define crypto_core_aes128encrypt_H - -#define crypto_core_aes128encrypt_tinynacl_OUTPUTBYTES 16 -#define crypto_core_aes128encrypt_tinynacl_INPUTBYTES 16 -#define crypto_core_aes128encrypt_tinynacl_KEYBYTES 16 -#define crypto_core_aes128encrypt_tinynacl_CONSTBYTES 0 -extern int crypto_core_aes128encrypt_tinynacl(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *); - -#define crypto_core_aes128encrypt crypto_core_aes128encrypt_tinynacl -#define crypto_core_aes128encrypt_OUTPUTBYTES crypto_core_aes128encrypt_tinynacl_OUTPUTBYTES -#define crypto_core_aes128encrypt_INPUTBYTES crypto_core_aes128encrypt_tinynacl_INPUTBYTES -#define crypto_core_aes128encrypt_KEYBYTES crypto_core_aes128encrypt_tinynacl_KEYBYTES -#define crypto_core_aes128encrypt_CONSTBYTES crypto_core_aes128encrypt_tinynacl_CONSTBYTES -#define crypto_core_aes128encrypt_IMPLEMENTATION "tinynacl" -#define crypto_core_aes128encrypt_VERSION "-" - -#endif diff --git a/man/tinysshd.8 b/man/tinysshd.8 index 3fb2691..e23f243 100644 --- a/man/tinysshd.8 +++ b/man/tinysshd.8 @@ -35,7 +35,7 @@ print error messages (default) print extra information .TP .B \-o -enable older standardized crypto \- ecdsa\-sha2\-nistp256, ecdh\-sha2\-nistp256, aes128\-ctr, aes256\-ctr, hmac\-sha2\-256 +enable older standardized crypto \- ecdsa\-sha2\-nistp256, ecdh\-sha2\-nistp256, aes256\-ctr, hmac\-sha2\-256 .TP .B \-O disable older standardized crypto (default) diff --git a/tinyssh/LIBS b/tinyssh/LIBS index d3bcf76..b003b54 100644 --- a/tinyssh/LIBS +++ b/tinyssh/LIBS @@ -41,7 +41,6 @@ porttostr.o randommod.o readall.o savesync.o -sshcrypto_cipher_aesctr128.o sshcrypto_cipher_aesctr256.o sshcrypto_cipher_aesctr.o sshcrypto_cipher_chachapoly.o diff --git a/tinyssh/SOURCES b/tinyssh/SOURCES index 37cf732..82b3009 100644 --- a/tinyssh/SOURCES +++ b/tinyssh/SOURCES @@ -45,7 +45,6 @@ ssh sshcrypto sshcrypto_cipher sshcrypto_cipher_aesctr -sshcrypto_cipher_aesctr128 sshcrypto_cipher_aesctr256 sshcrypto_cipher_chachapoly sshcrypto_kex diff --git a/tinyssh/sshcrypto.h b/tinyssh/sshcrypto.h index 6e7f984..f27b0b8 100644 --- a/tinyssh/sshcrypto.h +++ b/tinyssh/sshcrypto.h @@ -5,7 +5,7 @@ #include "crypto.h" /* crypto type */ -#define sshcrypto_TYPEOLDCRYPTO 0x1 /* ecdsa-sha2-nistp256, ecdh-sha2-nistp256, aes128-ctr, aes256-ctr, hmac-sha2-256 */ +#define sshcrypto_TYPEOLDCRYPTO 0x1 /* ecdsa-sha2-nistp256, ecdh-sha2-nistp256, aes256-ctr, hmac-sha2-256 */ #define sshcrypto_TYPENEWCRYPTO 0x2 /* ssh-ed25519, curve25519-sha256@libssh.org, chacha20-poly1305@openssh.com */ #define sshcrypto_TYPEPQCRYPTO 0x4 /* TODO, TODO, chacha20-poly1305@openssh.com */ @@ -165,8 +165,6 @@ extern int chachapoly_packet_get(struct buf *); /* from sshcrypto_cipher_aesctr.c */ extern void aesctr_packet_put(struct buf *); extern int aesctr_packet_get(struct buf *); -/* from sshcrypto_cipher_aesctr128.c */ -extern int aesctr128_xor(unsigned char *, const unsigned char *, unsigned long long, const unsigned char *, const unsigned char *); /* from sshcrypto_cipher_aesctr256.c */ extern int aesctr256_xor(unsigned char *, const unsigned char *, unsigned long long, const unsigned char *, const unsigned char *); diff --git a/tinyssh/sshcrypto_cipher.c b/tinyssh/sshcrypto_cipher.c index b28e504..9cfb44f 100644 --- a/tinyssh/sshcrypto_cipher.c +++ b/tinyssh/sshcrypto_cipher.c @@ -28,19 +28,6 @@ struct sshcrypto_cipher sshcrypto_ciphers[] = { 0 }, #endif -#if defined(crypto_core_aes128encrypt_KEYBYTES) && defined(crypto_auth_hmacsha256_BYTES) - { "aes128-ctr", - aesctr128_xor, - crypto_auth_hmacsha256, - crypto_core_aes128encrypt_KEYBYTES, - 16, - crypto_auth_hmacsha256_BYTES, - aesctr_packet_put, - aesctr_packet_get, - sshcrypto_TYPEOLDCRYPTO, - 0 - }, -#endif #if defined(crypto_core_aes256encrypt_KEYBYTES) && defined(crypto_auth_hmacsha256_BYTES) { "aes256-ctr", aesctr256_xor, @@ -138,7 +125,7 @@ void sshcrypto_cipher_put(struct buf *b) { } /* -XXX we support only hmac-sha2-256 with aes128-ctr and aes256-ctr +XXX we support only hmac-sha2-256 with aes256-ctr for chacha20-poly1305@openssh.com is hmac-sha2-256 string ignored */ void sshcrypto_cipher_macput(struct buf *b) { diff --git a/tinyssh/sshcrypto_cipher_aesctr128.c b/tinyssh/sshcrypto_cipher_aesctr128.c deleted file mode 100644 index 42616ca..0000000 --- a/tinyssh/sshcrypto_cipher_aesctr128.c +++ /dev/null @@ -1,35 +0,0 @@ -#include "crypto.h" -#include "sshcrypto.h" - -#if defined(crypto_core_aes128encrypt_KEYBYTES) - -int aesctr128_xor(unsigned char *c, const unsigned char *m, unsigned long long l, const unsigned char *nn, const unsigned char *k) { - - unsigned int u; - unsigned char x[16]; - unsigned char *n = (unsigned char *)nn; /* XXX */ - long long i; - - if (l % 16) return -1; - - while (l >= 16) { - crypto_core_aes128encrypt(x, n, k, 0); - for (i = 0; i < 16; ++i) c[i] = m[i] ^ x[i]; - - u = 1; - for (i = 15; i >= 0; --i) { - u += (unsigned int) n[i]; - n[i] = u; - u >>= 8; - } - - l -= 16; - m += 16; - c += 16; - } - - for (i = 0; i < sizeof x; ++i) x[i] = 0; - return 0; -} - -#endif diff --git a/tinyssh/tinysshd.exp b/tinyssh/tinysshd.exp index e96deb1..770eff3 100644 --- a/tinyssh/tinysshd.exp +++ b/tinyssh/tinysshd.exp @@ -27,8 +27,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: curve25519-sha256@libssh.org,ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ssh-ed25519,ecdsa-sha2-nistp256 -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -36,8 +36,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: curve25519-sha256@libssh.org,ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ssh-ed25519,ecdsa-sha2-nistp256 -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -45,8 +45,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: curve25519-sha256@libssh.org,ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ssh-ed25519,ecdsa-sha2-nistp256 -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -54,8 +54,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: curve25519-sha256@libssh.org,ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ssh-ed25519,ecdsa-sha2-nistp256 -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -63,8 +63,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ecdsa-sha2-nistp256 -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -72,8 +72,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ecdsa-sha2-nistp256 -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -81,8 +81,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ecdsa-sha2-nistp256 -_tinysshd-printkex: info: encryption algorithms client to server: aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -90,8 +90,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ecdsa-sha2-nistp256 -_tinysshd-printkex: info: encryption algorithms client to server: aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -171,8 +171,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: curve25519-sha256@libssh.org,ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ssh-ed25519 -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -180,8 +180,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: curve25519-sha256@libssh.org,ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ssh-ed25519 -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -189,8 +189,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: curve25519-sha256@libssh.org,ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ssh-ed25519 -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -198,8 +198,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: curve25519-sha256@libssh.org,ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ssh-ed25519 -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -207,8 +207,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -216,8 +216,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -225,8 +225,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: -_tinysshd-printkex: info: encryption algorithms client to server: aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -234,8 +234,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: -_tinysshd-printkex: info: encryption algorithms client to server: aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -315,8 +315,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: curve25519-sha256@libssh.org,ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ecdsa-sha2-nistp256 -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -324,8 +324,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: curve25519-sha256@libssh.org,ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ecdsa-sha2-nistp256 -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -333,8 +333,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: curve25519-sha256@libssh.org,ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ecdsa-sha2-nistp256 -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -342,8 +342,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: curve25519-sha256@libssh.org,ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ecdsa-sha2-nistp256 -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -351,8 +351,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ecdsa-sha2-nistp256 -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -360,8 +360,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ecdsa-sha2-nistp256 -_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: chacha20-poly1305@openssh.com,aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: chacha20-poly1305@openssh.com,aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -369,8 +369,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ecdsa-sha2-nistp256 -_tinysshd-printkex: info: encryption algorithms client to server: aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 @@ -378,8 +378,8 @@ _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256 _tinysshd-printkex: info: kex algorithms: ecdh-sha2-nistp256 _tinysshd-printkex: info: server host key algorithms: ecdsa-sha2-nistp256 -_tinysshd-printkex: info: encryption algorithms client to server: aes128-ctr,aes256-ctr -_tinysshd-printkex: info: encryption algorithms server to client: aes128-ctr,aes256-ctr +_tinysshd-printkex: info: encryption algorithms client to server: aes256-ctr +_tinysshd-printkex: info: encryption algorithms server to client: aes256-ctr _tinysshd-printkex: info: mac algorithms client to server: hmac-sha2-256 _tinysshd-printkex: info: mac algorithms server to client: hmac-sha2-256