summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--cipher.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8cf7e5eba..90c575141 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@
8 [sftp-int.c] 8 [sftp-int.c]
9 Fix issue pointed out with ls not handling large directories 9 Fix issue pointed out with ls not handling large directories
10 with embeded paths correctly. OK damien@ 10 with embeded paths correctly. OK damien@
11 - hshoexer@cvs.openbsd.org 2004/01/23 19:26:33
12 [cipher.c]
13 rename acss@opebsd.org to acss@openssh.org
14 ok deraadt@
11 - (djm) [acss.c acss.h cipher-acss.c] Portable support for ACSS 15 - (djm) [acss.c acss.h cipher-acss.c] Portable support for ACSS
12 if libcrypto lacks it 16 if libcrypto lacks it
13 17
@@ -1750,4 +1754,4 @@
1750 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1754 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1751 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1755 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1752 1756
1753$Id: ChangeLog,v 1.3194 2004/01/27 10:20:11 djm Exp $ 1757$Id: ChangeLog,v 1.3195 2004/01/27 10:20:59 djm Exp $
diff --git a/cipher.c b/cipher.c
index 190b8688b..79c07ec4f 100644
--- a/cipher.c
+++ b/cipher.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: cipher.c,v 1.67 2004/01/23 17:06:03 hshoexer Exp $"); 38RCSID("$OpenBSD: cipher.c,v 1.68 2004/01/23 19:26:33 hshoexer Exp $");
39 39
40#include "xmalloc.h" 40#include "xmalloc.h"
41#include "log.h" 41#include "log.h"
@@ -104,7 +104,7 @@ struct Cipher {
104 { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, evp_aes_128_ctr }, 104 { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, evp_aes_128_ctr },
105#endif 105#endif
106#if defined(EVP_CTRL_SET_ACSS_MODE) 106#if defined(EVP_CTRL_SET_ACSS_MODE)
107 { "acss@openbsd.org", SSH_CIPHER_SSH2, 16, 5, EVP_acss }, 107 { "acss@openssh.org", SSH_CIPHER_SSH2, 16, 5, EVP_acss },
108#endif 108#endif
109 { NULL, SSH_CIPHER_ILLEGAL, 0, 0, NULL } 109 { NULL, SSH_CIPHER_ILLEGAL, 0, 0, NULL }
110}; 110};