diff options
Diffstat (limited to 'src/lib/libcrypto/evp/e_des.c')
| -rw-r--r-- | src/lib/libcrypto/evp/e_des.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/libcrypto/evp/e_des.c b/src/lib/libcrypto/evp/e_des.c index 1f0de7cbfd..0a32d2adb9 100644 --- a/src/lib/libcrypto/evp/e_des.c +++ b/src/lib/libcrypto/evp/e_des.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: e_des.c,v 1.10 2014/07/10 22:45:57 jsing Exp $ */ | 1 | /* $OpenBSD: e_des.c,v 1.11 2014/07/11 08:44:48 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -60,14 +60,15 @@ | |||
| 60 | 60 | ||
| 61 | #include <openssl/opensslconf.h> | 61 | #include <openssl/opensslconf.h> |
| 62 | 62 | ||
| 63 | #include "cryptlib.h" | ||
| 64 | #ifndef OPENSSL_NO_DES | 63 | #ifndef OPENSSL_NO_DES |
| 64 | |||
| 65 | #include <openssl/evp.h> | 65 | #include <openssl/evp.h> |
| 66 | #include <openssl/objects.h> | ||
| 67 | #include "evp_locl.h" | ||
| 68 | #include <openssl/des.h> | 66 | #include <openssl/des.h> |
| 67 | #include <openssl/objects.h> | ||
| 69 | #include <openssl/rand.h> | 68 | #include <openssl/rand.h> |
| 70 | 69 | ||
| 70 | #include "evp_locl.h" | ||
| 71 | |||
| 71 | static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | 72 | static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, |
| 72 | const unsigned char *iv, int enc); | 73 | const unsigned char *iv, int enc); |
| 73 | static int des_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr); | 74 | static int des_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr); |
