summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2000-09-12 00:38:32 +0000
committerderaadt <deraadt@openbsd.org>2000-09-12 00:38:32 +0000
commit97c4efff42ca4213d6d2ed5e6f02f7da07896744 (patch)
tree4cfbd75eee8a4be5ed66280f58633b58047f8414
parentsync (diff)
downloadwireguard-openbsd-97c4efff42ca4213d6d2ed5e6f02f7da07896744.tar.xz
wireguard-openbsd-97c4efff42ca4213d6d2ed5e6f02f7da07896744.zip
a few more comments about it being ARC4 not RC4
-rw-r--r--usr.bin/ssh/LICENCE2
-rw-r--r--usr.bin/ssh/cipher.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/LICENCE b/usr.bin/ssh/LICENCE
index e8ab01b9b74..7c2346a040e 100644
--- a/usr.bin/ssh/LICENCE
+++ b/usr.bin/ssh/LICENCE
@@ -36,7 +36,7 @@ OpenSSH contains no GPL code.
- The make-ssh-known-hosts script is no longer included
- TSS has been removed
- MD5 is now external, in the OpenSSL library
- - RC4 support has been removed
+ - RC4 support has been replaced with ARC4 support from OpenSSL
- Blowfish is now external, in the OpenSSL library
[The licence continues]
diff --git a/usr.bin/ssh/cipher.c b/usr.bin/ssh/cipher.c
index 899f0522a8a..c7985a79c0c 100644
--- a/usr.bin/ssh/cipher.c
+++ b/usr.bin/ssh/cipher.c
@@ -35,7 +35,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: cipher.c,v 1.30 2000/09/07 20:27:50 deraadt Exp $");
+RCSID("$OpenBSD: cipher.c,v 1.31 2000/09/12 00:38:32 deraadt Exp $");
#include "ssh.h"
#include "cipher.h"
@@ -141,7 +141,7 @@ static char *cipher_names[] =
"des",
"3des",
"tss",
- "rc4",
+ "rc4", /* Alleged RC4 */
"blowfish",
"reserved",
"blowfish-cbc",