diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | cipher.c | 8 | ||||
-rw-r--r-- | myproposal.h | 4 |
3 files changed, 12 insertions, 6 deletions
@@ -1,6 +1,10 @@ | |||
1 | 20020404 | 1 | 20020404 |
2 | - (stevesk) [auth-pam.c auth-pam.h auth-passwd.c auth-sia.c auth-sia.h | 2 | - (stevesk) [auth-pam.c auth-pam.h auth-passwd.c auth-sia.c auth-sia.h |
3 | auth1.c auth2.c] PAM, OSF_SIA password auth cleanup; from djm. | 3 | auth1.c auth2.c] PAM, OSF_SIA password auth cleanup; from djm. |
4 | - (bal) OpenBSD CVS Sync | ||
5 | - markus@cvs.openbsd.org 2002/04/03 09:26:11 | ||
6 | [cipher.c myproposal.h] | ||
7 | re-add rijndael-cbc@lysator.liu.se for MacSSH; ash@lab.poc.net | ||
4 | 8 | ||
5 | 20020402 | 9 | 20020402 |
6 | - (bal) Hand Sync of scp.c (reverted to upstream code) | 10 | - (bal) Hand Sync of scp.c (reverted to upstream code) |
@@ -8151,4 +8155,4 @@ | |||
8151 | - Wrote replacements for strlcpy and mkdtemp | 8155 | - Wrote replacements for strlcpy and mkdtemp |
8152 | - Released 1.0pre1 | 8156 | - Released 1.0pre1 |
8153 | 8157 | ||
8154 | $Id: ChangeLog,v 1.2021 2002/04/04 19:02:28 stevesk Exp $ | 8158 | $Id: ChangeLog,v 1.2022 2002/04/04 22:10:38 mouring Exp $ |
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: cipher.c,v 1.54 2002/03/19 10:49:35 markus Exp $"); | 38 | RCSID("$OpenBSD: cipher.c,v 1.55 2002/04/03 09:26:11 markus Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "log.h" | 41 | #include "log.h" |
@@ -72,6 +72,8 @@ struct Cipher { | |||
72 | { "aes128-cbc", SSH_CIPHER_SSH2, 16, 16, evp_rijndael }, | 72 | { "aes128-cbc", SSH_CIPHER_SSH2, 16, 16, evp_rijndael }, |
73 | { "aes192-cbc", SSH_CIPHER_SSH2, 16, 24, evp_rijndael }, | 73 | { "aes192-cbc", SSH_CIPHER_SSH2, 16, 24, evp_rijndael }, |
74 | { "aes256-cbc", SSH_CIPHER_SSH2, 16, 32, evp_rijndael }, | 74 | { "aes256-cbc", SSH_CIPHER_SSH2, 16, 32, evp_rijndael }, |
75 | { "rijndael-cbc@lysator.liu.se", | ||
76 | SSH_CIPHER_SSH2, 16, 32, evp_rijndael }, | ||
75 | 77 | ||
76 | { NULL, SSH_CIPHER_ILLEGAL, 0, 0, NULL } | 78 | { NULL, SSH_CIPHER_ILLEGAL, 0, 0, NULL } |
77 | }; | 79 | }; |
@@ -584,7 +586,7 @@ cipher_get_keyiv(CipherContext *cc, u_char *iv, u_int len) | |||
584 | fatal("%s: wrong iv length %d != %d", __FUNCTION__, | 586 | fatal("%s: wrong iv length %d != %d", __FUNCTION__, |
585 | evplen, len); | 587 | evplen, len); |
586 | 588 | ||
587 | if (strncmp(c->name, "aes", 3) == 0) { | 589 | if (c->evptype == evp_rijndael) { |
588 | struct ssh_rijndael_ctx *aesc; | 590 | struct ssh_rijndael_ctx *aesc; |
589 | 591 | ||
590 | aesc = EVP_CIPHER_CTX_get_app_data(&cc->evp); | 592 | aesc = EVP_CIPHER_CTX_get_app_data(&cc->evp); |
@@ -629,7 +631,7 @@ cipher_set_keyiv(CipherContext *cc, u_char *iv) | |||
629 | if (evplen == 0) | 631 | if (evplen == 0) |
630 | return; | 632 | return; |
631 | 633 | ||
632 | if (strncmp(c->name, "aes", 3) == 0) { | 634 | if (c->evptype == evp_rijndael) { |
633 | struct ssh_rijndael_ctx *aesc; | 635 | struct ssh_rijndael_ctx *aesc; |
634 | 636 | ||
635 | aesc = EVP_CIPHER_CTX_get_app_data(&cc->evp); | 637 | 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 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.13 2002/01/21 22:30:12 markus Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.14 2002/04/03 09:26:11 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -27,7 +27,7 @@ | |||
27 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" | 27 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" |
28 | #define KEX_DEFAULT_ENCRYPT \ | 28 | #define KEX_DEFAULT_ENCRYPT \ |
29 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \ | 29 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \ |
30 | "aes192-cbc,aes256-cbc" | 30 | "aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se" |
31 | #define KEX_DEFAULT_MAC \ | 31 | #define KEX_DEFAULT_MAC \ |
32 | "hmac-md5,hmac-sha1,hmac-ripemd160," \ | 32 | "hmac-md5,hmac-sha1,hmac-ripemd160," \ |
33 | "hmac-ripemd160@openssh.com," \ | 33 | "hmac-ripemd160@openssh.com," \ |