- markus@cvs.openbsd.org 2002/01/21 22:30:12

     [cipher.c compat.c myproposal.h]
     remove "rijndael-*", just use "aes-" since this how rijndael is called
     in the drafts; ok stevesk@

1 files changed, 1 insertions, 17 deletions

diff --git a/cipher.c b/cipher.c
index 2186d88ec..58b0e8aa7 100644
--- a/cipher.c
+++ b/cipher.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: cipher.c,v 1.49 2002/01/18 18:14:17 stevesk Exp $");
+RCSID("$OpenBSD: cipher.c,v 1.50 2002/01/21 22:30:12 markus Exp $");
 
 #include "xmalloc.h"
 #include "log.h"
@@ -392,22 +392,6 @@ Cipher ciphers[] = {
                 SSH_CIPHER_SSH2, 16, 32,
                 rijndael_setkey, rijndael_setiv,
                 rijndael_cbc_encrypt, rijndael_cbc_decrypt },
-        { "rijndael128-cbc",
-                SSH_CIPHER_SSH2, 16, 16,
-                rijndael_setkey, rijndael_setiv,
-                rijndael_cbc_encrypt, rijndael_cbc_decrypt },
-        { "rijndael192-cbc",
-                SSH_CIPHER_SSH2, 16, 24,
-                rijndael_setkey, rijndael_setiv,
-                rijndael_cbc_encrypt, rijndael_cbc_decrypt },
-        { "rijndael256-cbc",
-                SSH_CIPHER_SSH2, 16, 32,
-                rijndael_setkey, rijndael_setiv,
-                rijndael_cbc_encrypt, rijndael_cbc_decrypt },
-        { "rijndael-cbc@lysator.liu.se",
-                SSH_CIPHER_SSH2, 16, 32,
-                rijndael_setkey, rijndael_setiv,
-                rijndael_cbc_encrypt, rijndael_cbc_decrypt },
         { NULL, SSH_CIPHER_ILLEGAL, 0, 0, NULL, NULL, NULL, NULL }
 };