diff options
Diffstat (limited to 'src/lib/libcrypto/pem/pem_info.c')
| -rw-r--r-- | src/lib/libcrypto/pem/pem_info.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/lib/libcrypto/pem/pem_info.c b/src/lib/libcrypto/pem/pem_info.c index eaf70e4267..9ddcb56596 100644 --- a/src/lib/libcrypto/pem/pem_info.c +++ b/src/lib/libcrypto/pem/pem_info.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pem_info.c,v 1.18 2014/07/10 22:45:57 jsing Exp $ */ | 1 | /* $OpenBSD: pem_info.c,v 1.19 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 | * |
| @@ -61,18 +61,19 @@ | |||
| 61 | 61 | ||
| 62 | #include <openssl/opensslconf.h> | 62 | #include <openssl/opensslconf.h> |
| 63 | 63 | ||
| 64 | #include "cryptlib.h" | ||
| 65 | #include <openssl/buffer.h> | 64 | #include <openssl/buffer.h> |
| 66 | #include <openssl/objects.h> | 65 | #include <openssl/err.h> |
| 67 | #include <openssl/evp.h> | 66 | #include <openssl/evp.h> |
| 68 | #include <openssl/x509.h> | 67 | #include <openssl/objects.h> |
| 69 | #include <openssl/pem.h> | 68 | #include <openssl/pem.h> |
| 70 | #ifndef OPENSSL_NO_RSA | 69 | #include <openssl/x509.h> |
| 71 | #include <openssl/rsa.h> | 70 | |
| 72 | #endif | ||
| 73 | #ifndef OPENSSL_NO_DSA | 71 | #ifndef OPENSSL_NO_DSA |
| 74 | #include <openssl/dsa.h> | 72 | #include <openssl/dsa.h> |
| 75 | #endif | 73 | #endif |
| 74 | #ifndef OPENSSL_NO_RSA | ||
| 75 | #include <openssl/rsa.h> | ||
| 76 | #endif | ||
| 76 | 77 | ||
| 77 | STACK_OF(X509_INFO) * | 78 | STACK_OF(X509_INFO) * |
| 78 | PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, | 79 | PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, |
