diff options
Diffstat (limited to 'src/lib/libcrypto/des/des.h')
-rw-r--r-- | src/lib/libcrypto/des/des.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/libcrypto/des/des.h b/src/lib/libcrypto/des/des.h index 81bd874edd..7318593699 100644 --- a/src/lib/libcrypto/des/des.h +++ b/src/lib/libcrypto/des/des.h | |||
@@ -59,13 +59,13 @@ | |||
59 | #ifndef HEADER_DES_H | 59 | #ifndef HEADER_DES_H |
60 | #define HEADER_DES_H | 60 | #define HEADER_DES_H |
61 | 61 | ||
62 | #include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, | ||
63 | DES_LONG (via openssl/opensslconf.h */ | ||
64 | |||
62 | #ifdef OPENSSL_NO_DES | 65 | #ifdef OPENSSL_NO_DES |
63 | #error DES is disabled. | 66 | #error DES is disabled. |
64 | #endif | 67 | #endif |
65 | 68 | ||
66 | #include <openssl/opensslconf.h> /* DES_LONG */ | ||
67 | #include <openssl/e_os2.h> /* OPENSSL_EXTERN */ | ||
68 | |||
69 | #ifdef OPENSSL_BUILD_SHLIBCRYPTO | 69 | #ifdef OPENSSL_BUILD_SHLIBCRYPTO |
70 | # undef OPENSSL_EXTERN | 70 | # undef OPENSSL_EXTERN |
71 | # define OPENSSL_EXTERN OPENSSL_EXPORT | 71 | # define OPENSSL_EXTERN OPENSSL_EXPORT |
@@ -130,7 +130,7 @@ OPENSSL_DECLARE_GLOBAL(int,DES_rw_mode); /* defaults to DES_PCBC_MODE */ | |||
130 | #define DES_rw_mode OPENSSL_GLOBAL_REF(DES_rw_mode) | 130 | #define DES_rw_mode OPENSSL_GLOBAL_REF(DES_rw_mode) |
131 | 131 | ||
132 | const char *DES_options(void); | 132 | const char *DES_options(void); |
133 | void DES_ecb3_encrypt(const unsigned char *input, unsigned char *output, | 133 | void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output, |
134 | DES_key_schedule *ks1,DES_key_schedule *ks2, | 134 | DES_key_schedule *ks1,DES_key_schedule *ks2, |
135 | DES_key_schedule *ks3, int enc); | 135 | DES_key_schedule *ks3, int enc); |
136 | DES_LONG DES_cbc_cksum(const unsigned char *input,DES_cblock *output, | 136 | DES_LONG DES_cbc_cksum(const unsigned char *input,DES_cblock *output, |
@@ -197,9 +197,10 @@ void DES_ede3_ofb64_encrypt(const unsigned char *in,unsigned char *out, | |||
197 | long length,DES_key_schedule *ks1, | 197 | long length,DES_key_schedule *ks1, |
198 | DES_key_schedule *ks2,DES_key_schedule *ks3, | 198 | DES_key_schedule *ks2,DES_key_schedule *ks3, |
199 | DES_cblock *ivec,int *num); | 199 | DES_cblock *ivec,int *num); |
200 | 200 | #if 0 | |
201 | void DES_xwhite_in2out(const_DES_cblock *DES_key,const_DES_cblock *in_white, | 201 | void DES_xwhite_in2out(const_DES_cblock *DES_key,const_DES_cblock *in_white, |
202 | DES_cblock *out_white); | 202 | DES_cblock *out_white); |
203 | #endif | ||
203 | 204 | ||
204 | int DES_enc_read(int fd,void *buf,int len,DES_key_schedule *sched, | 205 | int DES_enc_read(int fd,void *buf,int len,DES_key_schedule *sched, |
205 | DES_cblock *iv); | 206 | DES_cblock *iv); |