removed aes128

janmojzis · Aug 11, 2016 · 35a4bca · 35a4bca
1 parent 72cfe9b
commit 35a4bca
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 254 deletions.
diff --git a/crypto-tests/crypto_core_aes128encrypttest.c b/crypto-tests/crypto_core_aes128encrypttest.c
diff --git 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
@@ -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
@@ -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
diff --git a/crypto/crypto_core_aes128encrypt.h b/crypto/crypto_core_aes128encrypt.h
diff --git 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
@@ -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
@@ -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
@@ -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, [email protected], [email protected] */
 #define sshcrypto_TYPEPQCRYPTO  0x4 /* TODO, TODO, [email protected] */
 
@@ -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
@@ -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 [email protected] 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