diff options
Diffstat (limited to 'src/lib/libcrypto/des/des.h')
| -rw-r--r-- | src/lib/libcrypto/des/des.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/libcrypto/des/des.h b/src/lib/libcrypto/des/des.h index 1eaedcbd24..7318593699 100644 --- a/src/lib/libcrypto/des/des.h +++ b/src/lib/libcrypto/des/des.h | |||
| @@ -56,8 +56,8 @@ | |||
| 56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #ifndef HEADER_NEW_DES_H | 59 | #ifndef HEADER_DES_H |
| 60 | #define HEADER_NEW_DES_H | 60 | #define HEADER_DES_H |
| 61 | 61 | ||
| 62 | #include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, | 62 | #include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, |
| 63 | DES_LONG (via openssl/opensslconf.h */ | 63 | DES_LONG (via openssl/opensslconf.h */ |
| @@ -71,6 +71,8 @@ | |||
| 71 | # define OPENSSL_EXTERN OPENSSL_EXPORT | 71 | # define OPENSSL_EXTERN OPENSSL_EXPORT |
| 72 | #endif | 72 | #endif |
| 73 | 73 | ||
| 74 | #define des_SPtrans DES_SPtrans | ||
| 75 | |||
| 74 | #ifdef __cplusplus | 76 | #ifdef __cplusplus |
| 75 | extern "C" { | 77 | extern "C" { |
| 76 | #endif | 78 | #endif |
| @@ -224,9 +226,6 @@ int DES_set_key(const_DES_cblock *key,DES_key_schedule *schedule); | |||
| 224 | int DES_key_sched(const_DES_cblock *key,DES_key_schedule *schedule); | 226 | int DES_key_sched(const_DES_cblock *key,DES_key_schedule *schedule); |
| 225 | int DES_set_key_checked(const_DES_cblock *key,DES_key_schedule *schedule); | 227 | int DES_set_key_checked(const_DES_cblock *key,DES_key_schedule *schedule); |
| 226 | void DES_set_key_unchecked(const_DES_cblock *key,DES_key_schedule *schedule); | 228 | void DES_set_key_unchecked(const_DES_cblock *key,DES_key_schedule *schedule); |
| 227 | #ifdef OPENSSL_FIPS | ||
| 228 | void private_DES_set_key_unchecked(const_DES_cblock *key,DES_key_schedule *schedule); | ||
| 229 | #endif | ||
| 230 | void DES_string_to_key(const char *str,DES_cblock *key); | 229 | void DES_string_to_key(const char *str,DES_cblock *key); |
| 231 | void DES_string_to_2keys(const char *str,DES_cblock *key1,DES_cblock *key2); | 230 | void DES_string_to_2keys(const char *str,DES_cblock *key1,DES_cblock *key2); |
| 232 | void DES_cfb64_encrypt(const unsigned char *in,unsigned char *out,long length, | 231 | void DES_cfb64_encrypt(const unsigned char *in,unsigned char *out,long length, |
