diff options
| author | djm <> | 2008-09-06 12:15:56 +0000 |
|---|---|---|
| committer | djm <> | 2008-09-06 12:15:56 +0000 |
| commit | 5a3c0a05c7f2c5d3c584b7c8d6aec836dd724c80 (patch) | |
| tree | aba68249883aa9d2361d92eef69a81d0c4961732 /src/lib/libcrypto/rc4/rc4.h | |
| parent | f6198d4d0ab97685dc56be2d48715ed39fcc74b9 (diff) | |
| download | openbsd-5a3c0a05c7f2c5d3c584b7c8d6aec836dd724c80.tar.gz openbsd-5a3c0a05c7f2c5d3c584b7c8d6aec836dd724c80.tar.bz2 openbsd-5a3c0a05c7f2c5d3c584b7c8d6aec836dd724c80.zip | |
import of OpenSSL 0.9.8h
Diffstat (limited to 'src/lib/libcrypto/rc4/rc4.h')
| -rw-r--r-- | src/lib/libcrypto/rc4/rc4.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libcrypto/rc4/rc4.h b/src/lib/libcrypto/rc4/rc4.h index ae0cea75b8..7aec04fe93 100644 --- a/src/lib/libcrypto/rc4/rc4.h +++ b/src/lib/libcrypto/rc4/rc4.h | |||
| @@ -59,12 +59,11 @@ | |||
| 59 | #ifndef HEADER_RC4_H | 59 | #ifndef HEADER_RC4_H |
| 60 | #define HEADER_RC4_H | 60 | #define HEADER_RC4_H |
| 61 | 61 | ||
| 62 | #include <openssl/opensslconf.h> /* OPENSSL_NO_RC4, RC4_INT */ | ||
| 62 | #ifdef OPENSSL_NO_RC4 | 63 | #ifdef OPENSSL_NO_RC4 |
| 63 | #error RC4 is disabled. | 64 | #error RC4 is disabled. |
| 64 | #endif | 65 | #endif |
| 65 | 66 | ||
| 66 | #include <openssl/opensslconf.h> /* RC4_INT */ | ||
| 67 | |||
| 68 | #ifdef __cplusplus | 67 | #ifdef __cplusplus |
| 69 | extern "C" { | 68 | extern "C" { |
| 70 | #endif | 69 | #endif |
| @@ -77,9 +76,6 @@ typedef struct rc4_key_st | |||
| 77 | 76 | ||
| 78 | 77 | ||
| 79 | const char *RC4_options(void); | 78 | const char *RC4_options(void); |
| 80 | #ifdef OPENSSL_FIPS | ||
| 81 | void private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data); | ||
| 82 | #endif | ||
| 83 | void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data); | 79 | void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data); |
| 84 | void RC4(RC4_KEY *key, unsigned long len, const unsigned char *indata, | 80 | void RC4(RC4_KEY *key, unsigned long len, const unsigned char *indata, |
| 85 | unsigned char *outdata); | 81 | unsigned char *outdata); |
