- Merged OpenBSD CVS changes:

   - [auth-rh-rsa.c auth-rsa.c authfd.c authfd.h hostfile.c mpaux.c]
     [mpaux.h ssh-add.c ssh-agent.c ssh.h ssh.c sshd.c]
     the keysize of rsa-parameter 'n' is passed implizit,
     a few more checks and warnings about 'pretended' keysizes.
   - [cipher.c cipher.h packet.c packet.h sshd.c]
     remove support for cipher RC4
   - [ssh.c]
     a note for legay systems about secuity issues with permanently_set_uid(),
     the private hostkey and ptrace()
   - [sshconnect.c]
     more detailed messages about adding and checking hostkeys

1 files changed, 5 insertions, 5 deletions

diff --git a/cipher.h b/cipher.h
index 9c2a0b52c..5bfb74241 100644
--- a/cipher.h
+++ b/cipher.h
@@ -11,13 +11,13 @@ Created: Wed Apr 19 16:50:42 1995 ylo
 
 */
 
-/* RCSID("$Id: cipher.h,v 1.2 1999/10/28 03:25:17 damien Exp $"); */
-
-#include "config.h"
+/* RCSID("$Id: cipher.h,v 1.3 1999/11/16 02:37:16 damien Exp $"); */
 
 #ifndef CIPHER_H
 #define CIPHER_H
 
+#include "config.h"
+
 #ifdef HAVE_OPENSSL
 #include <openssl/des.h>
 #include <openssl/blowfish.h>
@@ -34,8 +34,8 @@ Created: Wed Apr 19 16:50:42 1995 ylo
 #define SSH_CIPHER_IDEA         1 /* IDEA CFB */
 #define SSH_CIPHER_DES          2 /* DES CBC */
 #define SSH_CIPHER_3DES         3 /* 3DES CBC */
-#define SSH_CIPHER_TSS          4 /* TRI's Simple Stream encryption CBC */
-#define SSH_CIPHER_RC4          5 /* Alleged RC4 */
+#define SSH_CIPHER_BROKEN_TSS   4 /* TRI's Simple Stream encryption CBC */
+#define SSH_CIPHER_BROKEN_RC4   5 /* Alleged RC4 */
 #define SSH_CIPHER_BLOWFISH     6
 
 typedef struct {