- 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@

diff --git a/ChangeLog b/ChangeLog
index 84f802dafeeb6de1b27d5b0be11db7f4bf1d4d03..bf06f2fae307a440747603769386a6e8700bc582 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -215,6 +215,10 @@
      [sshconnect.c]
      use read_passphrase+ECHO in confirm(), allows use of ssh-askpass
      for hostkey confirm.
+   - 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@
 
 20020121
  - (djm) Rework ssh-rand-helper:

diff --git a/cipher.c b/cipher.c
index 2186d88ec027c4652d6b887142db7b21322d68fa..58b0e8aa78ed087dbe220d88f8986ea2f673ba3a 100644 (file)
--- 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 }
 };
 

diff --git a/compat.c b/compat.c
index 6a9ba46538403404a62c8e20381d08da669105b1..050ee47babb8f1a3cae6ba2292852614404c1df5 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.57 2002/01/13 17:57:37 markus Exp $");
+RCSID("$OpenBSD: compat.c,v 1.58 2002/01/21 22:30:12 markus Exp $");
 
 #include "buffer.h"
 #include "packet.h"
@@ -193,7 +193,7 @@ compat_cipher_proposal(char *cipher_prop)
        buffer_init(&b);
        tmp = orig_prop = xstrdup(cipher_prop);
        while ((cp = strsep(&tmp, ",")) != NULL) {
-               if (strncmp(cp, "aes", 3) && strncmp(cp, "rijndael", 8)) {
+               if (strncmp(cp, "aes", 3) != 0) {
                        if (buffer_len(&b) > 0)
                                buffer_append(&b, ",", 1);
                        buffer_append(&b, cp, strlen(cp));

diff --git a/myproposal.h b/myproposal.h
index 4a9a363709b071755ef9020a3be900f5a5f3b48d..1caf04a4eeb8826cd12b50b8935fff58aa458ef3 100644 (file)
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: myproposal.h,v 1.12 2001/03/05 15:56:16 deraadt Exp $ */
+/*     $OpenBSD: myproposal.h,v 1.13 2002/01/21 22:30:12 markus Exp $  */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -27,9 +27,7 @@
 #define        KEX_DEFAULT_PK_ALG      "ssh-rsa,ssh-dss"
 #define        KEX_DEFAULT_ENCRYPT \
        "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \
-       "aes192-cbc,aes256-cbc," \
-       "rijndael128-cbc,rijndael192-cbc,rijndael256-cbc," \
-       "rijndael-cbc@lysator.liu.se"
+       "aes192-cbc,aes256-cbc"
 #define        KEX_DEFAULT_MAC \
        "hmac-md5,hmac-sha1,hmac-ripemd160," \
        "hmac-ripemd160@openssh.com," \