summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509
diff options
context:
space:
mode:
authorjsing <>2014-07-11 08:44:49 +0000
committerjsing <>2014-07-11 08:44:49 +0000
commit8c3482db610348be15fb633bb52b0511c2cabbcf (patch)
tree0e726f9e971e00f4c8cd8afab71589803fc11b7f /src/lib/libcrypto/x509
parenta336cdb63c1fe5d934826147bf5c19d317ced73b (diff)
downloadopenbsd-8c3482db610348be15fb633bb52b0511c2cabbcf.tar.gz
openbsd-8c3482db610348be15fb633bb52b0511c2cabbcf.tar.bz2
openbsd-8c3482db610348be15fb633bb52b0511c2cabbcf.zip
Only import cryptlib.h in the four source files that actually need it.
Remove the openssl public includes from cryptlib.h and add a small number of includes into the source files that actually need them. While here, also sort/group/tidy the includes. ok beck@ miod@
Diffstat (limited to 'src/lib/libcrypto/x509')
-rw-r--r--src/lib/libcrypto/x509/by_dir.c9
-rw-r--r--src/lib/libcrypto/x509/by_file.c9
-rw-r--r--src/lib/libcrypto/x509/x509_att.c9
-rw-r--r--src/lib/libcrypto/x509/x509_cmp.c4
-rw-r--r--src/lib/libcrypto/x509/x509_d2.c5
-rw-r--r--src/lib/libcrypto/x509/x509_ext.c9
-rw-r--r--src/lib/libcrypto/x509/x509_lu.c5
-rw-r--r--src/lib/libcrypto/x509/x509_obj.c6
-rw-r--r--src/lib/libcrypto/x509/x509_r2x.c11
-rw-r--r--src/lib/libcrypto/x509/x509_req.c12
-rw-r--r--src/lib/libcrypto/x509/x509_set.c6
-rw-r--r--src/lib/libcrypto/x509/x509_trs.c6
-rw-r--r--src/lib/libcrypto/x509/x509_txt.c11
-rw-r--r--src/lib/libcrypto/x509/x509_v3.c9
-rw-r--r--src/lib/libcrypto/x509/x509_vfy.c12
-rw-r--r--src/lib/libcrypto/x509/x509_vpm.c5
-rw-r--r--src/lib/libcrypto/x509/x509cset.c6
-rw-r--r--src/lib/libcrypto/x509/x509name.c8
-rw-r--r--src/lib/libcrypto/x509/x509rset.c6
-rw-r--r--src/lib/libcrypto/x509/x509spki.c4
-rw-r--r--src/lib/libcrypto/x509/x509type.c4
-rw-r--r--src/lib/libcrypto/x509/x_all.c14
22 files changed, 85 insertions, 85 deletions
diff --git a/src/lib/libcrypto/x509/by_dir.c b/src/lib/libcrypto/x509/by_dir.c
index 110c22d6f5..a7dc2292bc 100644
--- a/src/lib/libcrypto/x509/by_dir.c
+++ b/src/lib/libcrypto/x509/by_dir.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: by_dir.c,v 1.31 2014/07/10 22:45:58 jsing Exp $ */ 1/* $OpenBSD: by_dir.c,v 1.32 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 *
@@ -66,15 +66,14 @@
66 66
67#include <openssl/opensslconf.h> 67#include <openssl/opensslconf.h>
68 68
69#include "cryptlib.h" 69#include <openssl/err.h>
70#include <openssl/lhash.h>
71#include <openssl/x509.h>
70 72
71#ifndef OPENSSL_NO_POSIX_IO 73#ifndef OPENSSL_NO_POSIX_IO
72# include <sys/stat.h> 74# include <sys/stat.h>
73#endif 75#endif
74 76
75#include <openssl/lhash.h>
76#include <openssl/x509.h>
77
78typedef struct lookup_dir_hashes_st { 77typedef struct lookup_dir_hashes_st {
79 unsigned long hash; 78 unsigned long hash;
80 int suffix; 79 int suffix;
diff --git a/src/lib/libcrypto/x509/by_file.c b/src/lib/libcrypto/x509/by_file.c
index cf3553181d..10adcfbd77 100644
--- a/src/lib/libcrypto/x509/by_file.c
+++ b/src/lib/libcrypto/x509/by_file.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: by_file.c,v 1.14 2014/07/10 13:58:23 jsing Exp $ */ 1/* $OpenBSD: by_file.c,v 1.15 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,12 +61,11 @@
61#include <time.h> 61#include <time.h>
62#include <unistd.h> 62#include <unistd.h>
63 63
64#include "cryptlib.h"
65#include <openssl/lhash.h>
66#include <openssl/buffer.h> 64#include <openssl/buffer.h>
67#include <openssl/x509.h> 65#include <openssl/err.h>
68#include <openssl/pem.h> 66#include <openssl/pem.h>
69 67#include <openssl/lhash.h>
68#include <openssl/x509.h>
70 69
71static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, 70static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
72 long argl, char **ret); 71 long argl, char **ret);
diff --git a/src/lib/libcrypto/x509/x509_att.c b/src/lib/libcrypto/x509/x509_att.c
index 241464d999..4ae7504cae 100644
--- a/src/lib/libcrypto/x509/x509_att.c
+++ b/src/lib/libcrypto/x509/x509_att.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_att.c,v 1.10 2014/07/03 21:21:11 miod Exp $ */ 1/* $OpenBSD: x509_att.c,v 1.11 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 *
@@ -57,11 +57,12 @@
57 */ 57 */
58 58
59#include <stdio.h> 59#include <stdio.h>
60#include <openssl/stack.h> 60
61#include "cryptlib.h"
62#include <openssl/asn1.h> 61#include <openssl/asn1.h>
63#include <openssl/objects.h> 62#include <openssl/err.h>
64#include <openssl/evp.h> 63#include <openssl/evp.h>
64#include <openssl/objects.h>
65#include <openssl/stack.h>
65#include <openssl/x509.h> 66#include <openssl/x509.h>
66#include <openssl/x509v3.h> 67#include <openssl/x509v3.h>
67 68
diff --git a/src/lib/libcrypto/x509/x509_cmp.c b/src/lib/libcrypto/x509/x509_cmp.c
index 20b4ceba27..e26866dc80 100644
--- a/src/lib/libcrypto/x509/x509_cmp.c
+++ b/src/lib/libcrypto/x509/x509_cmp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_cmp.c,v 1.21 2014/07/10 22:45:58 jsing Exp $ */ 1/* $OpenBSD: x509_cmp.c,v 1.22 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,8 +62,8 @@
62 62
63#include <openssl/opensslconf.h> 63#include <openssl/opensslconf.h>
64 64
65#include "cryptlib.h"
66#include <openssl/asn1.h> 65#include <openssl/asn1.h>
66#include <openssl/err.h>
67#include <openssl/objects.h> 67#include <openssl/objects.h>
68#include <openssl/x509.h> 68#include <openssl/x509.h>
69#include <openssl/x509v3.h> 69#include <openssl/x509v3.h>
diff --git a/src/lib/libcrypto/x509/x509_d2.c b/src/lib/libcrypto/x509/x509_d2.c
index 9d42a63f30..cc22f4f470 100644
--- a/src/lib/libcrypto/x509/x509_d2.c
+++ b/src/lib/libcrypto/x509/x509_d2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_d2.c,v 1.8 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: x509_d2.c,v 1.9 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 *
@@ -57,8 +57,9 @@
57 */ 57 */
58 58
59#include <stdio.h> 59#include <stdio.h>
60#include "cryptlib.h" 60
61#include <openssl/crypto.h> 61#include <openssl/crypto.h>
62#include <openssl/err.h>
62#include <openssl/x509.h> 63#include <openssl/x509.h>
63 64
64int 65int
diff --git a/src/lib/libcrypto/x509/x509_ext.c b/src/lib/libcrypto/x509/x509_ext.c
index 9d4f1d1122..a5b5430ad4 100644
--- a/src/lib/libcrypto/x509/x509_ext.c
+++ b/src/lib/libcrypto/x509/x509_ext.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_ext.c,v 1.7 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: x509_ext.c,v 1.8 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 *
@@ -57,15 +57,14 @@
57 */ 57 */
58 58
59#include <stdio.h> 59#include <stdio.h>
60#include <openssl/stack.h> 60
61#include "cryptlib.h"
62#include <openssl/asn1.h> 61#include <openssl/asn1.h>
63#include <openssl/objects.h>
64#include <openssl/evp.h> 62#include <openssl/evp.h>
63#include <openssl/objects.h>
64#include <openssl/stack.h>
65#include <openssl/x509.h> 65#include <openssl/x509.h>
66#include <openssl/x509v3.h> 66#include <openssl/x509v3.h>
67 67
68
69int 68int
70X509_CRL_get_ext_count(X509_CRL *x) 69X509_CRL_get_ext_count(X509_CRL *x)
71{ 70{
diff --git a/src/lib/libcrypto/x509/x509_lu.c b/src/lib/libcrypto/x509/x509_lu.c
index 1634ae951d..8d3e4f4dce 100644
--- a/src/lib/libcrypto/x509/x509_lu.c
+++ b/src/lib/libcrypto/x509/x509_lu.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_lu.c,v 1.15 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: x509_lu.c,v 1.16 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 *
@@ -57,7 +57,8 @@
57 */ 57 */
58 58
59#include <stdio.h> 59#include <stdio.h>
60#include "cryptlib.h" 60
61#include <openssl/err.h>
61#include <openssl/lhash.h> 62#include <openssl/lhash.h>
62#include <openssl/x509.h> 63#include <openssl/x509.h>
63#include <openssl/x509v3.h> 64#include <openssl/x509v3.h>
diff --git a/src/lib/libcrypto/x509/x509_obj.c b/src/lib/libcrypto/x509/x509_obj.c
index 88f058d882..f7f2a380a1 100644
--- a/src/lib/libcrypto/x509/x509_obj.c
+++ b/src/lib/libcrypto/x509/x509_obj.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_obj.c,v 1.15 2014/07/10 13:58:23 jsing Exp $ */ 1/* $OpenBSD: x509_obj.c,v 1.16 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 *
@@ -59,11 +59,11 @@
59#include <stdio.h> 59#include <stdio.h>
60#include <string.h> 60#include <string.h>
61 61
62#include "cryptlib.h" 62#include <openssl/buffer.h>
63#include <openssl/err.h>
63#include <openssl/lhash.h> 64#include <openssl/lhash.h>
64#include <openssl/objects.h> 65#include <openssl/objects.h>
65#include <openssl/x509.h> 66#include <openssl/x509.h>
66#include <openssl/buffer.h>
67 67
68char * 68char *
69X509_NAME_oneline(X509_NAME *a, char *buf, int len) 69X509_NAME_oneline(X509_NAME *a, char *buf, int len)
diff --git a/src/lib/libcrypto/x509/x509_r2x.c b/src/lib/libcrypto/x509/x509_r2x.c
index e87dd11fba..9a9a59d9bb 100644
--- a/src/lib/libcrypto/x509/x509_r2x.c
+++ b/src/lib/libcrypto/x509/x509_r2x.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_r2x.c,v 1.8 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: x509_r2x.c,v 1.9 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 *
@@ -57,13 +57,14 @@
57 */ 57 */
58 58
59#include <stdio.h> 59#include <stdio.h>
60#include "cryptlib.h" 60
61#include <openssl/asn1.h>
61#include <openssl/bn.h> 62#include <openssl/bn.h>
63#include <openssl/buffer.h>
64#include <openssl/err.h>
62#include <openssl/evp.h> 65#include <openssl/evp.h>
63#include <openssl/asn1.h>
64#include <openssl/x509.h>
65#include <openssl/objects.h> 66#include <openssl/objects.h>
66#include <openssl/buffer.h> 67#include <openssl/x509.h>
67 68
68X509 * 69X509 *
69X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey) 70X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
diff --git a/src/lib/libcrypto/x509/x509_req.c b/src/lib/libcrypto/x509/x509_req.c
index d22fc12a70..22d2124614 100644
--- a/src/lib/libcrypto/x509/x509_req.c
+++ b/src/lib/libcrypto/x509/x509_req.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_req.c,v 1.14 2014/07/10 22:45:58 jsing Exp $ */ 1/* $OpenBSD: x509_req.c,v 1.15 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 *
@@ -60,15 +60,15 @@
60 60
61#include <openssl/opensslconf.h> 61#include <openssl/opensslconf.h>
62 62
63#include "cryptlib.h"
64#include <openssl/bn.h>
65#include <openssl/evp.h>
66#include <openssl/asn1.h> 63#include <openssl/asn1.h>
67#include <openssl/asn1t.h> 64#include <openssl/asn1t.h>
68#include <openssl/x509.h> 65#include <openssl/bn.h>
69#include <openssl/objects.h>
70#include <openssl/buffer.h> 66#include <openssl/buffer.h>
67#include <openssl/err.h>
68#include <openssl/evp.h>
69#include <openssl/objects.h>
71#include <openssl/pem.h> 70#include <openssl/pem.h>
71#include <openssl/x509.h>
72 72
73X509_REQ * 73X509_REQ *
74X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md) 74X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
diff --git a/src/lib/libcrypto/x509/x509_set.c b/src/lib/libcrypto/x509/x509_set.c
index 523c6621b1..3be557cbc0 100644
--- a/src/lib/libcrypto/x509/x509_set.c
+++ b/src/lib/libcrypto/x509/x509_set.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_set.c,v 1.8 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: x509_set.c,v 1.9 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 *
@@ -57,10 +57,10 @@
57 */ 57 */
58 58
59#include <stdio.h> 59#include <stdio.h>
60#include "cryptlib.h" 60
61#include <openssl/asn1.h> 61#include <openssl/asn1.h>
62#include <openssl/objects.h>
63#include <openssl/evp.h> 62#include <openssl/evp.h>
63#include <openssl/objects.h>
64#include <openssl/x509.h> 64#include <openssl/x509.h>
65 65
66int 66int
diff --git a/src/lib/libcrypto/x509/x509_trs.c b/src/lib/libcrypto/x509/x509_trs.c
index b8e01603c5..f104c1fd16 100644
--- a/src/lib/libcrypto/x509/x509_trs.c
+++ b/src/lib/libcrypto/x509/x509_trs.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_trs.c,v 1.14 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: x509_trs.c,v 1.15 2014/07/11 08:44:49 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -57,9 +57,9 @@
57 */ 57 */
58 58
59#include <stdio.h> 59#include <stdio.h>
60#include "cryptlib.h"
61#include <openssl/x509v3.h>
62 60
61#include <openssl/err.h>
62#include <openssl/x509v3.h>
63 63
64static int tr_cmp(const X509_TRUST * const *a, const X509_TRUST * const *b); 64static int tr_cmp(const X509_TRUST * const *a, const X509_TRUST * const *b);
65static void trtable_free(X509_TRUST *p); 65static void trtable_free(X509_TRUST *p);
diff --git a/src/lib/libcrypto/x509/x509_txt.c b/src/lib/libcrypto/x509/x509_txt.c
index b1b3f3e58d..14fa2378c4 100644
--- a/src/lib/libcrypto/x509/x509_txt.c
+++ b/src/lib/libcrypto/x509/x509_txt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_txt.c,v 1.18 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: x509_txt.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 *
@@ -56,17 +56,16 @@
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58 58
59#include <errno.h>
59#include <stdio.h> 60#include <stdio.h>
60#include <time.h> 61#include <time.h>
61#include <errno.h>
62 62
63#include "cryptlib.h" 63#include <openssl/asn1.h>
64#include <openssl/lhash.h>
65#include <openssl/buffer.h> 64#include <openssl/buffer.h>
66#include <openssl/evp.h> 65#include <openssl/evp.h>
67#include <openssl/asn1.h> 66#include <openssl/lhash.h>
68#include <openssl/x509.h>
69#include <openssl/objects.h> 67#include <openssl/objects.h>
68#include <openssl/x509.h>
70 69
71const char * 70const char *
72X509_verify_cert_error_string(long n) 71X509_verify_cert_error_string(long n)
diff --git a/src/lib/libcrypto/x509/x509_v3.c b/src/lib/libcrypto/x509/x509_v3.c
index 7425782ebf..a745e6f71b 100644
--- a/src/lib/libcrypto/x509/x509_v3.c
+++ b/src/lib/libcrypto/x509/x509_v3.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_v3.c,v 1.9 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: x509_v3.c,v 1.10 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 *
@@ -57,11 +57,12 @@
57 */ 57 */
58 58
59#include <stdio.h> 59#include <stdio.h>
60#include <openssl/stack.h> 60
61#include "cryptlib.h"
62#include <openssl/asn1.h> 61#include <openssl/asn1.h>
63#include <openssl/objects.h> 62#include <openssl/err.h>
64#include <openssl/evp.h> 63#include <openssl/evp.h>
64#include <openssl/objects.h>
65#include <openssl/stack.h>
65#include <openssl/x509.h> 66#include <openssl/x509.h>
66#include <openssl/x509v3.h> 67#include <openssl/x509v3.h>
67 68
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c
index 60067d220f..f7feb85f36 100644
--- a/src/lib/libcrypto/x509/x509_vfy.c
+++ b/src/lib/libcrypto/x509/x509_vfy.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_vfy.c,v 1.32 2014/07/10 22:45:58 jsing Exp $ */ 1/* $OpenBSD: x509_vfy.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 *
@@ -64,15 +64,15 @@
64 64
65#include <openssl/opensslconf.h> 65#include <openssl/opensslconf.h>
66 66
67#include "cryptlib.h" 67#include <openssl/asn1.h>
68#include <openssl/crypto.h>
69#include <openssl/lhash.h>
70#include <openssl/buffer.h> 68#include <openssl/buffer.h>
69#include <openssl/crypto.h>
70#include <openssl/err.h>
71#include <openssl/evp.h> 71#include <openssl/evp.h>
72#include <openssl/asn1.h> 72#include <openssl/lhash.h>
73#include <openssl/objects.h>
73#include <openssl/x509.h> 74#include <openssl/x509.h>
74#include <openssl/x509v3.h> 75#include <openssl/x509v3.h>
75#include <openssl/objects.h>
76 76
77/* CRL score values */ 77/* CRL score values */
78 78
diff --git a/src/lib/libcrypto/x509/x509_vpm.c b/src/lib/libcrypto/x509/x509_vpm.c
index 3730d593cd..ec35267298 100644
--- a/src/lib/libcrypto/x509/x509_vpm.c
+++ b/src/lib/libcrypto/x509/x509_vpm.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_vpm.c,v 1.8 2014/07/10 13:58:23 jsing Exp $ */ 1/* $OpenBSD: x509_vpm.c,v 1.9 2014/07/11 08:44:49 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2004. 3 * project 2004.
4 */ 4 */
@@ -59,10 +59,9 @@
59#include <stdio.h> 59#include <stdio.h>
60#include <string.h> 60#include <string.h>
61 61
62#include "cryptlib.h" 62#include <openssl/buffer.h>
63#include <openssl/crypto.h> 63#include <openssl/crypto.h>
64#include <openssl/lhash.h> 64#include <openssl/lhash.h>
65#include <openssl/buffer.h>
66#include <openssl/x509.h> 65#include <openssl/x509.h>
67#include <openssl/x509v3.h> 66#include <openssl/x509v3.h>
68 67
diff --git a/src/lib/libcrypto/x509/x509cset.c b/src/lib/libcrypto/x509/x509cset.c
index 8ef19c2a40..a4442632f6 100644
--- a/src/lib/libcrypto/x509/x509cset.c
+++ b/src/lib/libcrypto/x509/x509cset.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509cset.c,v 1.7 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: x509cset.c,v 1.8 2014/07/11 08:44:49 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2001. 3 * project 2001.
4 */ 4 */
@@ -57,10 +57,10 @@
57 */ 57 */
58 58
59#include <stdio.h> 59#include <stdio.h>
60#include "cryptlib.h" 60
61#include <openssl/asn1.h> 61#include <openssl/asn1.h>
62#include <openssl/objects.h>
63#include <openssl/evp.h> 62#include <openssl/evp.h>
63#include <openssl/objects.h>
64#include <openssl/x509.h> 64#include <openssl/x509.h>
65 65
66int 66int
diff --git a/src/lib/libcrypto/x509/x509name.c b/src/lib/libcrypto/x509/x509name.c
index 4151ea0bc5..465a1cadb5 100644
--- a/src/lib/libcrypto/x509/x509name.c
+++ b/src/lib/libcrypto/x509/x509name.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509name.c,v 1.11 2014/07/10 13:58:23 jsing Exp $ */ 1/* $OpenBSD: x509name.c,v 1.12 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 *
@@ -59,11 +59,11 @@
59#include <stdio.h> 59#include <stdio.h>
60#include <string.h> 60#include <string.h>
61 61
62#include <openssl/stack.h>
63#include "cryptlib.h"
64#include <openssl/asn1.h> 62#include <openssl/asn1.h>
65#include <openssl/objects.h> 63#include <openssl/err.h>
66#include <openssl/evp.h> 64#include <openssl/evp.h>
65#include <openssl/objects.h>
66#include <openssl/stack.h>
67#include <openssl/x509.h> 67#include <openssl/x509.h>
68 68
69int 69int
diff --git a/src/lib/libcrypto/x509/x509rset.c b/src/lib/libcrypto/x509/x509rset.c
index 509f38b111..cfac977636 100644
--- a/src/lib/libcrypto/x509/x509rset.c
+++ b/src/lib/libcrypto/x509/x509rset.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509rset.c,v 1.5 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: x509rset.c,v 1.6 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 *
@@ -57,10 +57,10 @@
57 */ 57 */
58 58
59#include <stdio.h> 59#include <stdio.h>
60#include "cryptlib.h" 60
61#include <openssl/asn1.h> 61#include <openssl/asn1.h>
62#include <openssl/objects.h>
63#include <openssl/evp.h> 62#include <openssl/evp.h>
63#include <openssl/objects.h>
64#include <openssl/x509.h> 64#include <openssl/x509.h>
65 65
66int 66int
diff --git a/src/lib/libcrypto/x509/x509spki.c b/src/lib/libcrypto/x509/x509spki.c
index 28e499b9b2..cd29a8138a 100644
--- a/src/lib/libcrypto/x509/x509spki.c
+++ b/src/lib/libcrypto/x509/x509spki.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509spki.c,v 1.11 2014/07/10 13:58:23 jsing Exp $ */ 1/* $OpenBSD: x509spki.c,v 1.12 2014/07/11 08:44:49 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -59,7 +59,7 @@
59#include <stdio.h> 59#include <stdio.h>
60#include <string.h> 60#include <string.h>
61 61
62#include "cryptlib.h" 62#include <openssl/err.h>
63#include <openssl/x509.h> 63#include <openssl/x509.h>
64 64
65int 65int
diff --git a/src/lib/libcrypto/x509/x509type.c b/src/lib/libcrypto/x509/x509type.c
index 29f38e2a9a..58335b4e64 100644
--- a/src/lib/libcrypto/x509/x509type.c
+++ b/src/lib/libcrypto/x509/x509type.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509type.c,v 1.10 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: x509type.c,v 1.11 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 *
@@ -57,7 +57,7 @@
57 */ 57 */
58 58
59#include <stdio.h> 59#include <stdio.h>
60#include "cryptlib.h" 60
61#include <openssl/evp.h> 61#include <openssl/evp.h>
62#include <openssl/objects.h> 62#include <openssl/objects.h>
63#include <openssl/x509.h> 63#include <openssl/x509.h>
diff --git a/src/lib/libcrypto/x509/x_all.c b/src/lib/libcrypto/x509/x_all.c
index f01e47416d..edb5f520fa 100644
--- a/src/lib/libcrypto/x509/x_all.c
+++ b/src/lib/libcrypto/x509/x_all.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x_all.c,v 1.17 2014/07/10 22:45:58 jsing Exp $ */ 1/* $OpenBSD: x_all.c,v 1.18 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 *
@@ -60,18 +60,18 @@
60 60
61#include <openssl/opensslconf.h> 61#include <openssl/opensslconf.h>
62 62
63#include <openssl/stack.h>
64#include "cryptlib.h"
65#include <openssl/buffer.h>
66#include <openssl/asn1.h> 63#include <openssl/asn1.h>
64#include <openssl/buffer.h>
67#include <openssl/evp.h> 65#include <openssl/evp.h>
66#include <openssl/stack.h>
68#include <openssl/x509.h> 67#include <openssl/x509.h>
69#ifndef OPENSSL_NO_RSA 68
70#include <openssl/rsa.h>
71#endif
72#ifndef OPENSSL_NO_DSA 69#ifndef OPENSSL_NO_DSA
73#include <openssl/dsa.h> 70#include <openssl/dsa.h>
74#endif 71#endif
72#ifndef OPENSSL_NO_RSA
73#include <openssl/rsa.h>
74#endif
75 75
76int 76int
77X509_verify(X509 *a, EVP_PKEY *r) 77X509_verify(X509 *a, EVP_PKEY *r)