summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-01-27 21:20:59 +1100
committerDamien Miller <djm@mindrot.org>2004-01-27 21:20:59 +1100
commitb2d1c2b3b82fbbd78ed3dce8e26a3e70fb1b9165 (patch)
treebe33fb24c7c7793375d7d2cc0567dc9488d37a87
parentb21be844711ff285ba24cf70bfb2c7238f60c1cc (diff)
- hshoexer@cvs.openbsd.org 2004/01/23 19:26:33
[cipher.c] rename acss@opebsd.org to acss@openssh.org ok deraadt@
-rw-r--r--ChangeLog6
-rw-r--r--cipher.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8cf7e5eb..90c57514 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@
[sftp-int.c]
Fix issue pointed out with ls not handling large directories
with embeded paths correctly. OK damien@
+ - hshoexer@cvs.openbsd.org 2004/01/23 19:26:33
+ [cipher.c]
+ rename acss@opebsd.org to acss@openssh.org
+ ok deraadt@
- (djm) [acss.c acss.h cipher-acss.c] Portable support for ACSS
if libcrypto lacks it
@@ -1750,4 +1754,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3194 2004/01/27 10:20:11 djm Exp $
+$Id: ChangeLog,v 1.3195 2004/01/27 10:20:59 djm Exp $
diff --git a/cipher.c b/cipher.c
index 190b8688..79c07ec4 100644
--- a/cipher.c
+++ b/cipher.c
@@ -35,7 +35,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: cipher.c,v 1.67 2004/01/23 17:06:03 hshoexer Exp $");
+RCSID("$OpenBSD: cipher.c,v 1.68 2004/01/23 19:26:33 hshoexer Exp $");
#include "xmalloc.h"
#include "log.h"
@@ -104,7 +104,7 @@ struct Cipher {
{ "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, evp_aes_128_ctr },
#endif
#if defined(EVP_CTRL_SET_ACSS_MODE)
- { "acss@openbsd.org", SSH_CIPHER_SSH2, 16, 5, EVP_acss },
+ { "acss@openssh.org", SSH_CIPHER_SSH2, 16, 5, EVP_acss },
#endif
{ NULL, SSH_CIPHER_ILLEGAL, 0, 0, NULL }
};