diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2002-01-21 22:30:13 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2002-01-21 22:30:13 +0000 |
| commit | f3494154e4e97b1ca8041f740f420d99a1c01225 (patch) | |
| tree | 1ede124a481803e143c21713ef3a44f6f5d8c89d /usr.bin | |
| parent | 9939e9b2be8e97a7cc5a23d705c793e7952a4f0c (diff) | |
remove "rijndael-*", just use "aes-" since this how rijndael is called
in the drafts; ok stevesk@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/cipher.c | 18 | ||||
| -rw-r--r-- | usr.bin/ssh/compat.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/myproposal.h | 6 |
3 files changed, 5 insertions, 23 deletions
diff --git a/usr.bin/ssh/cipher.c b/usr.bin/ssh/cipher.c index 2186d88ec02..58b0e8aa78e 100644 --- a/usr.bin/ssh/cipher.c +++ b/usr.bin/ssh/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/usr.bin/ssh/compat.c b/usr.bin/ssh/compat.c index 6a9ba465384..050ee47babb 100644 --- a/usr.bin/ssh/compat.c +++ b/usr.bin/ssh/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/usr.bin/ssh/myproposal.h b/usr.bin/ssh/myproposal.h index 4a9a363709b..1caf04a4eeb 100644 --- a/usr.bin/ssh/myproposal.h +++ b/usr.bin/ssh/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," \ |