summaryrefslogtreecommitdiffstats
path: root/cipher.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 13:34:35 +0100
committerDamien Miller <djm@mindrot.org>2002-01-22 13:34:35 +0100
commit914bef437e7b80da027116e140e41746dafc45ee (patch)
treea9fc11fcb1e528940191b12511b888f5ca46edcd /cipher.c
parent - markus@cvs.openbsd.org 2002/01/21 15:13:51 (diff)
downloadopenssh-914bef437e7b80da027116e140e41746dafc45ee.tar.xz
openssh-914bef437e7b80da027116e140e41746dafc45ee.zip
- 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@
Diffstat (limited to 'cipher.c')
-rw-r--r--cipher.c18
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 }
};