diff options
author | Damien Miller <djm@mindrot.org> | 2000-04-16 12:31:48 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-04-16 12:31:48 +1000 |
commit | 5f05637b0ef7058d3ab2ff385251f73dcc9cb5f7 (patch) | |
tree | 443665fb58916f33c2f346aa3284a444d3352311 /cipher.h | |
parent | a664e870f27e6dc2c73f393e95a229abc527e0e6 (diff) |
- Reduce diff against OpenBSD source
- All OpenSSL includes are now unconditionally referenced as
openssl/foo.h
- Pick up formatting changes
- Other minor changed (typecasts, etc) that I missed
Diffstat (limited to 'cipher.h')
-rw-r--r-- | cipher.h | 12 |
1 files changed, 1 insertions, 11 deletions
@@ -11,25 +11,15 @@ | |||
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
14 | /* RCSID("$Id: cipher.h,v 1.11 2000/04/16 01:18:41 damien Exp $"); */ | 14 | /* RCSID("$Id: cipher.h,v 1.12 2000/04/16 02:31:50 damien Exp $"); */ |
15 | 15 | ||
16 | #ifndef CIPHER_H | 16 | #ifndef CIPHER_H |
17 | #define CIPHER_H | 17 | #define CIPHER_H |
18 | 18 | ||
19 | #include "config.h" | ||
20 | |||
21 | #ifdef HAVE_OPENSSL | ||
22 | #include <openssl/des.h> | 19 | #include <openssl/des.h> |
23 | #include <openssl/blowfish.h> | 20 | #include <openssl/blowfish.h> |
24 | #include <openssl/rc4.h> | 21 | #include <openssl/rc4.h> |
25 | #include <openssl/cast.h> | 22 | #include <openssl/cast.h> |
26 | #endif | ||
27 | #ifdef HAVE_SSL | ||
28 | #include <ssl/des.h> | ||
29 | #include <ssl/blowfish.h> | ||
30 | #include <ssl/rc4.h> | ||
31 | #include <ssl/cast.h> | ||
32 | #endif | ||
33 | 23 | ||
34 | /* Cipher types. New types can be added, but old types should not be removed | 24 | /* Cipher types. New types can be added, but old types should not be removed |
35 | for compatibility. The maximum allowed value is 31. */ | 25 | for compatibility. The maximum allowed value is 31. */ |