summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2000-09-12 00:38:33 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2000-09-12 00:38:33 +0000
commit2c3f3e8a7b1f1a03f1444231710b9d1f12e96b66 (patch)
tree175671aaf61c780bfd2f90390c0d159e4398f057 /usr.bin/ssh
parent722059dbd2aadaf29adb9d008b9a3da1346cda49 (diff)
a few more comments about it being ARC4 not RC4
Diffstat (limited to 'usr.bin/ssh')
-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",