diff options
Diffstat (limited to 'src/lib/libcrypto/pem/pem_lib.c')
| -rw-r--r-- | src/lib/libcrypto/pem/pem_lib.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c index 70e2aa633d..8e5c82c245 100644 --- a/src/lib/libcrypto/pem/pem_lib.c +++ b/src/lib/libcrypto/pem/pem_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pem_lib.c,v 1.32 2014/07/10 22:45:57 jsing Exp $ */ | 1 | /* $OpenBSD: pem_lib.c,v 1.33 2014/07/11 08:44:49 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 | * |
| @@ -62,15 +62,14 @@ | |||
| 62 | 62 | ||
| 63 | #include <openssl/opensslconf.h> | 63 | #include <openssl/opensslconf.h> |
| 64 | 64 | ||
| 65 | #include "cryptlib.h" | ||
| 66 | #include <openssl/buffer.h> | 65 | #include <openssl/buffer.h> |
| 67 | #include <openssl/objects.h> | ||
| 68 | #include <openssl/evp.h> | 66 | #include <openssl/evp.h> |
| 69 | #include <openssl/rand.h> | 67 | #include <openssl/objects.h> |
| 70 | #include <openssl/x509.h> | ||
| 71 | #include <openssl/pem.h> | 68 | #include <openssl/pem.h> |
| 72 | #include <openssl/pkcs12.h> | 69 | #include <openssl/pkcs12.h> |
| 73 | #include "asn1_locl.h" | 70 | #include <openssl/rand.h> |
| 71 | #include <openssl/x509.h> | ||
| 72 | |||
| 74 | #ifndef OPENSSL_NO_DES | 73 | #ifndef OPENSSL_NO_DES |
| 75 | #include <openssl/des.h> | 74 | #include <openssl/des.h> |
| 76 | #endif | 75 | #endif |
| @@ -78,6 +77,8 @@ | |||
| 78 | #include <openssl/engine.h> | 77 | #include <openssl/engine.h> |
| 79 | #endif | 78 | #endif |
| 80 | 79 | ||
| 80 | #include "asn1_locl.h" | ||
| 81 | |||
| 81 | #define MIN_LENGTH 4 | 82 | #define MIN_LENGTH 4 |
| 82 | 83 | ||
| 83 | static int load_iv(char **fromp, unsigned char *to, int num); | 84 | static int load_iv(char **fromp, unsigned char *to, int num); |
