summaryrefslogtreecommitdiff
path: root/cipher.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-11-16 13:37:16 +1100
committerDamien Miller <djm@mindrot.org>1999-11-16 13:37:16 +1100
commit7e8e820153a620ab1dcd81857a7de0969c41d043 (patch)
tree226cc4185feae97f4069ad60b4c18d259aa5df2f /cipher.h
parent4874c79a3a05fc18678d7a85d7091f5139630fac (diff)
- 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
Diffstat (limited to 'cipher.h')
-rw-r--r--cipher.h10
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
11 11
12*/ 12*/
13 13
14/* RCSID("$Id: cipher.h,v 1.2 1999/10/28 03:25:17 damien Exp $"); */ 14/* RCSID("$Id: cipher.h,v 1.3 1999/11/16 02:37:16 damien Exp $"); */
15
16#include "config.h"
17 15
18#ifndef CIPHER_H 16#ifndef CIPHER_H
19#define CIPHER_H 17#define CIPHER_H
20 18
19#include "config.h"
20
21#ifdef HAVE_OPENSSL 21#ifdef HAVE_OPENSSL
22#include <openssl/des.h> 22#include <openssl/des.h>
23#include <openssl/blowfish.h> 23#include <openssl/blowfish.h>
@@ -34,8 +34,8 @@ Created: Wed Apr 19 16:50:42 1995 ylo
34#define SSH_CIPHER_IDEA 1 /* IDEA CFB */ 34#define SSH_CIPHER_IDEA 1 /* IDEA CFB */
35#define SSH_CIPHER_DES 2 /* DES CBC */ 35#define SSH_CIPHER_DES 2 /* DES CBC */
36#define SSH_CIPHER_3DES 3 /* 3DES CBC */ 36#define SSH_CIPHER_3DES 3 /* 3DES CBC */
37#define SSH_CIPHER_TSS 4 /* TRI's Simple Stream encryption CBC */ 37#define SSH_CIPHER_BROKEN_TSS 4 /* TRI's Simple Stream encryption CBC */
38#define SSH_CIPHER_RC4 5 /* Alleged RC4 */ 38#define SSH_CIPHER_BROKEN_RC4 5 /* Alleged RC4 */
39#define SSH_CIPHER_BLOWFISH 6 39#define SSH_CIPHER_BLOWFISH 6
40 40
41typedef struct { 41typedef struct {