===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/cipher.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- src/usr.bin/ssh/cipher.c	2002/03/19 10:49:35	1.54
+++ src/usr.bin/ssh/cipher.c	2002/04/03 09:26:11	1.55
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: cipher.c,v 1.54 2002/03/19 10:49:35 markus Exp $");
+RCSID("$OpenBSD: cipher.c,v 1.55 2002/04/03 09:26:11 markus Exp $");
 
 #include "xmalloc.h"
 #include "log.h"
@@ -67,6 +67,8 @@
 	{ "aes128-cbc", 	SSH_CIPHER_SSH2, 16, 16, evp_rijndael },
 	{ "aes192-cbc", 	SSH_CIPHER_SSH2, 16, 24, evp_rijndael },
 	{ "aes256-cbc", 	SSH_CIPHER_SSH2, 16, 32, evp_rijndael },
+	{ "rijndael-cbc@lysator.liu.se",
+				SSH_CIPHER_SSH2, 16, 32, evp_rijndael },
 
 	{ NULL,			SSH_CIPHER_ILLEGAL, 0, 0, NULL }
 };
@@ -541,7 +543,7 @@
 			fatal("%s: wrong iv length %d != %d", __FUNCTION__,
 			    evplen, len);
 
-		if (strncmp(c->name, "aes", 3) == 0) {
+		if (c->evptype == evp_rijndael) {
 			struct ssh_rijndael_ctx *aesc;
 
 			aesc = EVP_CIPHER_CTX_get_app_data(&cc->evp);
@@ -586,7 +588,7 @@
 		if (evplen == 0)
 			return;
 
-		if (strncmp(c->name, "aes", 3) == 0) {
+		if (c->evptype == evp_rijndael) {
 			struct ssh_rijndael_ctx *aesc;
 
 			aesc = EVP_CIPHER_CTX_get_app_data(&cc->evp);