3 files changed, 12 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 108ba4d50..0674792e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 20020404
  - (stevesk) [auth-pam.c auth-pam.h auth-passwd.c auth-sia.c auth-sia.h
     auth1.c auth2.c] PAM, OSF_SIA password auth cleanup; from djm.
+ - (bal) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2002/04/03 09:26:11
+     [cipher.c myproposal.h]
+     re-add rijndael-cbc@lysator.liu.se for MacSSH; ash@lab.poc.net
 
 20020402
  - (bal) Hand Sync of scp.c (reverted to upstream code)
@@ -8151,4 +8155,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.2021 2002/04/04 19:02:28 stevesk Exp $
+$Id: ChangeLog,v 1.2022 2002/04/04 22:10:38 mouring Exp $
diff --git a/cipher.c b/cipher.c
index a9ca99cd7..86d923409 100644
--- a/cipher.c
+++ b/cipher.c
@@ -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"
@@ -72,6 +72,8 @@ struct Cipher {
         { "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 }
 };
@@ -584,7 +586,7 @@ cipher_get_keyiv(CipherContext *cc, u_char *iv, u_int len)
                         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);
@@ -629,7 +631,7 @@ cipher_set_keyiv(CipherContext *cc, u_char *iv)
                 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);
diff --git a/myproposal.h b/myproposal.h
index 1caf04a4e..62f5cfb65 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: myproposal.h,v 1.13 2002/01/21 22:30:12 markus Exp $  */
+/*      $OpenBSD: myproposal.h,v 1.14 2002/04/03 09:26:11 markus Exp $  */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -27,7 +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"
+        "aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se"
 #define KEX_DEFAULT_MAC \
         "hmac-md5,hmac-sha1,hmac-ripemd160," \
         "hmac-ripemd160@openssh.com," \