diff options
Diffstat (limited to 'lib/libcrypto/pem/pem_lib.c')
| -rw-r--r-- | lib/libcrypto/pem/pem_lib.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/libcrypto/pem/pem_lib.c b/lib/libcrypto/pem/pem_lib.c index 70e2aa633dd..8e5c82c245c 100644 --- a/lib/libcrypto/pem/pem_lib.c +++ b/lib/libcrypto/pem/pem_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pem_lib.c,v 1.32 2014/07/10 22:45:57 jsing Exp $ */ +/* $OpenBSD: pem_lib.c,v 1.33 2014/07/11 08:44:49 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,15 +62,14 @@ #include <openssl/opensslconf.h> -#include "cryptlib.h" #include <openssl/buffer.h> -#include <openssl/objects.h> #include <openssl/evp.h> -#include <openssl/rand.h> -#include <openssl/x509.h> +#include <openssl/objects.h> #include <openssl/pem.h> #include <openssl/pkcs12.h> -#include "asn1_locl.h" +#include <openssl/rand.h> +#include <openssl/x509.h> + #ifndef OPENSSL_NO_DES #include <openssl/des.h> #endif @@ -78,6 +77,8 @@ #include <openssl/engine.h> #endif +#include "asn1_locl.h" + #define MIN_LENGTH 4 static int load_iv(char **fromp, unsigned char *to, int num); |