diff options
author | jsing <> | 2014-07-11 08:44:49 +0000 |
---|---|---|
committer | jsing <> | 2014-07-11 08:44:49 +0000 |
commit | 8c3482db610348be15fb633bb52b0511c2cabbcf (patch) | |
tree | 0e726f9e971e00f4c8cd8afab71589803fc11b7f /src/lib/libcrypto/bio | |
parent | a336cdb63c1fe5d934826147bf5c19d317ced73b (diff) | |
download | openbsd-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/bio')
-rw-r--r-- | src/lib/libcrypto/bio/b_dump.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/b_sock.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bf_buff.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bf_lbuf.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bf_nbio.c | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bf_null.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bio_cb.c | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bio_lib.c | 9 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_acpt.c | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_conn.c | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_dgram.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_fd.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_file.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_log.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_mem.c | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_null.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_sock.c | 4 |
17 files changed, 40 insertions, 47 deletions
diff --git a/src/lib/libcrypto/bio/b_dump.c b/src/lib/libcrypto/bio/b_dump.c index 62a6c269ac..91979bd755 100644 --- a/src/lib/libcrypto/bio/b_dump.c +++ b/src/lib/libcrypto/bio/b_dump.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: b_dump.c,v 1.18 2014/07/10 13:58:22 jsing Exp $ */ | 1 | /* $OpenBSD: b_dump.c,v 1.19 2014/07/11 08:44:47 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 | * |
@@ -65,8 +65,6 @@ | |||
65 | 65 | ||
66 | #include <openssl/bio.h> | 66 | #include <openssl/bio.h> |
67 | 67 | ||
68 | #include "cryptlib.h" | ||
69 | |||
70 | #define TRUNCATE | 68 | #define TRUNCATE |
71 | #define DUMP_WIDTH 16 | 69 | #define DUMP_WIDTH 16 |
72 | #define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH - ((i - (i > 6 ? 6 : i) + 3) / 4)) | 70 | #define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH - ((i - (i > 6 ? 6 : i) + 3) / 4)) |
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c index bbae2a31b9..8c37a3e175 100644 --- a/src/lib/libcrypto/bio/b_sock.c +++ b/src/lib/libcrypto/bio/b_sock.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: b_sock.c,v 1.53 2014/07/10 21:57:40 miod Exp $ */ | 1 | /* $OpenBSD: b_sock.c,v 1.54 2014/07/11 08:44:47 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 | * |
@@ -72,8 +72,8 @@ | |||
72 | #include <unistd.h> | 72 | #include <unistd.h> |
73 | 73 | ||
74 | #include <openssl/bio.h> | 74 | #include <openssl/bio.h> |
75 | 75 | #include <openssl/buffer.h> | |
76 | #include "cryptlib.h" | 76 | #include <openssl/err.h> |
77 | 77 | ||
78 | int | 78 | int |
79 | BIO_get_host_ip(const char *str, unsigned char *ip) | 79 | BIO_get_host_ip(const char *str, unsigned char *ip) |
diff --git a/src/lib/libcrypto/bio/bf_buff.c b/src/lib/libcrypto/bio/bf_buff.c index ea55e490be..ab47ae4627 100644 --- a/src/lib/libcrypto/bio/bf_buff.c +++ b/src/lib/libcrypto/bio/bf_buff.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bf_buff.c,v 1.20 2014/07/10 13:58:22 jsing Exp $ */ | 1 | /* $OpenBSD: bf_buff.c,v 1.21 2014/07/11 08:44:47 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,8 +60,8 @@ | |||
60 | #include <stdio.h> | 60 | #include <stdio.h> |
61 | #include <string.h> | 61 | #include <string.h> |
62 | 62 | ||
63 | #include "cryptlib.h" | ||
64 | #include <openssl/bio.h> | 63 | #include <openssl/bio.h> |
64 | #include <openssl/err.h> | ||
65 | 65 | ||
66 | static int buffer_write(BIO *h, const char *buf, int num); | 66 | static int buffer_write(BIO *h, const char *buf, int num); |
67 | static int buffer_read(BIO *h, char *buf, int size); | 67 | static int buffer_read(BIO *h, char *buf, int size); |
diff --git a/src/lib/libcrypto/bio/bf_lbuf.c b/src/lib/libcrypto/bio/bf_lbuf.c index 8c2b6e6d4d..e90b7f239f 100644 --- a/src/lib/libcrypto/bio/bf_lbuf.c +++ b/src/lib/libcrypto/bio/bf_lbuf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bf_lbuf.c,v 1.11 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: bf_lbuf.c,v 1.12 2014/07/11 08:44:47 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,9 +56,9 @@ | |||
56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
57 | */ | 57 | */ |
58 | 58 | ||
59 | #include <stdio.h> | ||
60 | #include <errno.h> | 59 | #include <errno.h> |
61 | #include "cryptlib.h" | 60 | #include <stdio.h> |
61 | |||
62 | #include <openssl/bio.h> | 62 | #include <openssl/bio.h> |
63 | #include <openssl/evp.h> | 63 | #include <openssl/evp.h> |
64 | 64 | ||
diff --git a/src/lib/libcrypto/bio/bf_nbio.c b/src/lib/libcrypto/bio/bf_nbio.c index e2480e7489..86a13a8bc8 100644 --- a/src/lib/libcrypto/bio/bf_nbio.c +++ b/src/lib/libcrypto/bio/bf_nbio.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bf_nbio.c,v 1.16 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: bf_nbio.c,v 1.17 2014/07/11 08:44:47 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,11 +56,11 @@ | |||
56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
57 | */ | 57 | */ |
58 | 58 | ||
59 | #include <stdio.h> | ||
60 | #include <errno.h> | 59 | #include <errno.h> |
61 | #include "cryptlib.h" | 60 | #include <stdio.h> |
62 | #include <openssl/rand.h> | 61 | |
63 | #include <openssl/bio.h> | 62 | #include <openssl/bio.h> |
63 | #include <openssl/rand.h> | ||
64 | 64 | ||
65 | /* BIO_put and BIO_get both add to the digest, | 65 | /* BIO_put and BIO_get both add to the digest, |
66 | * BIO_gets returns the digest */ | 66 | * BIO_gets returns the digest */ |
diff --git a/src/lib/libcrypto/bio/bf_null.c b/src/lib/libcrypto/bio/bf_null.c index 1ef2fbe0f9..09d54b6b21 100644 --- a/src/lib/libcrypto/bio/bf_null.c +++ b/src/lib/libcrypto/bio/bf_null.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bf_null.c,v 1.10 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: bf_null.c,v 1.11 2014/07/11 08:44:47 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,9 +56,9 @@ | |||
56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
57 | */ | 57 | */ |
58 | 58 | ||
59 | #include <stdio.h> | ||
60 | #include <errno.h> | 59 | #include <errno.h> |
61 | #include "cryptlib.h" | 60 | #include <stdio.h> |
61 | |||
62 | #include <openssl/bio.h> | 62 | #include <openssl/bio.h> |
63 | 63 | ||
64 | /* BIO_put and BIO_get both add to the digest, | 64 | /* BIO_put and BIO_get both add to the digest, |
diff --git a/src/lib/libcrypto/bio/bio_cb.c b/src/lib/libcrypto/bio/bio_cb.c index 5701b53d05..7d1f025452 100644 --- a/src/lib/libcrypto/bio/bio_cb.c +++ b/src/lib/libcrypto/bio/bio_cb.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bio_cb.c,v 1.14 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: bio_cb.c,v 1.15 2014/07/11 08:44:47 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,11 @@ | |||
57 | */ | 57 | */ |
58 | 58 | ||
59 | #include <stdio.h> | 59 | #include <stdio.h> |
60 | #include <string.h> | ||
61 | #include <stdlib.h> | 60 | #include <stdlib.h> |
62 | #include "cryptlib.h" | 61 | #include <string.h> |
63 | #include <openssl/bio.h> | 62 | |
64 | #include <openssl/err.h> | 63 | #include <openssl/err.h> |
64 | #include <openssl/bio.h> | ||
65 | 65 | ||
66 | long | 66 | long |
67 | BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi, long argl, | 67 | BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi, long argl, |
diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c index 876a357bef..41b3d31678 100644 --- a/src/lib/libcrypto/bio/bio_lib.c +++ b/src/lib/libcrypto/bio/bio_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bio_lib.c,v 1.18 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: bio_lib.c,v 1.19 2014/07/11 08:44:47 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,11 +56,12 @@ | |||
56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
57 | */ | 57 | */ |
58 | 58 | ||
59 | #include <stdio.h> | ||
60 | #include <errno.h> | 59 | #include <errno.h> |
61 | #include <openssl/crypto.h> | 60 | #include <stdio.h> |
62 | #include "cryptlib.h" | 61 | |
63 | #include <openssl/bio.h> | 62 | #include <openssl/bio.h> |
63 | #include <openssl/crypto.h> | ||
64 | #include <openssl/err.h> | ||
64 | #include <openssl/stack.h> | 65 | #include <openssl/stack.h> |
65 | 66 | ||
66 | BIO * | 67 | BIO * |
diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c index 580c52da6c..c0316a2999 100644 --- a/src/lib/libcrypto/bio/bss_acpt.c +++ b/src/lib/libcrypto/bio/bss_acpt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bss_acpt.c,v 1.22 2014/07/10 13:58:22 jsing Exp $ */ | 1 | /* $OpenBSD: bss_acpt.c,v 1.23 2014/07/11 08:44:47 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 | * |
@@ -63,8 +63,9 @@ | |||
63 | #include <string.h> | 63 | #include <string.h> |
64 | #include <unistd.h> | 64 | #include <unistd.h> |
65 | 65 | ||
66 | #include "cryptlib.h" | ||
67 | #include <openssl/bio.h> | 66 | #include <openssl/bio.h> |
67 | #include <openssl/buffer.h> | ||
68 | #include <openssl/err.h> | ||
68 | 69 | ||
69 | #define SOCKET_PROTOCOL IPPROTO_TCP | 70 | #define SOCKET_PROTOCOL IPPROTO_TCP |
70 | 71 | ||
diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c index d5763a0ce3..8049f5c3f0 100644 --- a/src/lib/libcrypto/bio/bss_conn.c +++ b/src/lib/libcrypto/bio/bss_conn.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bss_conn.c,v 1.28 2014/07/10 13:58:22 jsing Exp $ */ | 1 | /* $OpenBSD: bss_conn.c,v 1.29 2014/07/11 08:44:47 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,8 +66,9 @@ | |||
66 | #include <string.h> | 66 | #include <string.h> |
67 | #include <unistd.h> | 67 | #include <unistd.h> |
68 | 68 | ||
69 | #include "cryptlib.h" | ||
70 | #include <openssl/bio.h> | 69 | #include <openssl/bio.h> |
70 | #include <openssl/buffer.h> | ||
71 | #include <openssl/err.h> | ||
71 | 72 | ||
72 | #define SOCKET_PROTOCOL IPPROTO_TCP | 73 | #define SOCKET_PROTOCOL IPPROTO_TCP |
73 | 74 | ||
diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c index d56b71ba27..caa8480657 100644 --- a/src/lib/libcrypto/bio/bss_dgram.c +++ b/src/lib/libcrypto/bio/bss_dgram.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bss_dgram.c,v 1.30 2014/07/10 22:45:56 jsing Exp $ */ | 1 | /* $OpenBSD: bss_dgram.c,v 1.31 2014/07/11 08:44:47 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
@@ -69,7 +69,6 @@ | |||
69 | 69 | ||
70 | #include <openssl/opensslconf.h> | 70 | #include <openssl/opensslconf.h> |
71 | 71 | ||
72 | #include "cryptlib.h" | ||
73 | #include <openssl/bio.h> | 72 | #include <openssl/bio.h> |
74 | 73 | ||
75 | #ifndef OPENSSL_NO_DGRAM | 74 | #ifndef OPENSSL_NO_DGRAM |
diff --git a/src/lib/libcrypto/bio/bss_fd.c b/src/lib/libcrypto/bio/bss_fd.c index 6e8e8d0815..71abb4744a 100644 --- a/src/lib/libcrypto/bio/bss_fd.c +++ b/src/lib/libcrypto/bio/bss_fd.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bss_fd.c,v 1.16 2014/07/10 22:45:56 jsing Exp $ */ | 1 | /* $OpenBSD: bss_fd.c,v 1.17 2014/07/11 08:44:47 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 | * |
@@ -63,8 +63,6 @@ | |||
63 | 63 | ||
64 | #include <openssl/opensslconf.h> | 64 | #include <openssl/opensslconf.h> |
65 | 65 | ||
66 | #include "cryptlib.h" | ||
67 | |||
68 | #if defined(OPENSSL_NO_POSIX_IO) | 66 | #if defined(OPENSSL_NO_POSIX_IO) |
69 | /* | 67 | /* |
70 | * One can argue that one should implement dummy placeholder for | 68 | * One can argue that one should implement dummy placeholder for |
diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c index 44345f3c70..4fa3fb6062 100644 --- a/src/lib/libcrypto/bio/bss_file.c +++ b/src/lib/libcrypto/bio/bss_file.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bss_file.c,v 1.29 2014/07/10 13:58:22 jsing Exp $ */ | 1 | /* $OpenBSD: bss_file.c,v 1.30 2014/07/11 08:44:47 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 | * |
@@ -87,7 +87,6 @@ | |||
87 | #include <stdio.h> | 87 | #include <stdio.h> |
88 | #include <string.h> | 88 | #include <string.h> |
89 | 89 | ||
90 | #include "cryptlib.h" | ||
91 | #include <openssl/bio.h> | 90 | #include <openssl/bio.h> |
92 | #include <openssl/err.h> | 91 | #include <openssl/err.h> |
93 | 92 | ||
diff --git a/src/lib/libcrypto/bio/bss_log.c b/src/lib/libcrypto/bio/bss_log.c index 63361ce22f..fcaa985aa0 100644 --- a/src/lib/libcrypto/bio/bss_log.c +++ b/src/lib/libcrypto/bio/bss_log.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bss_log.c,v 1.20 2014/07/10 13:58:22 jsing Exp $ */ | 1 | /* $OpenBSD: bss_log.c,v 1.21 2014/07/11 08:44:47 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -67,8 +67,6 @@ | |||
67 | #include <string.h> | 67 | #include <string.h> |
68 | #include <syslog.h> | 68 | #include <syslog.h> |
69 | 69 | ||
70 | #include "cryptlib.h" | ||
71 | |||
72 | #include <openssl/buffer.h> | 70 | #include <openssl/buffer.h> |
73 | #include <openssl/err.h> | 71 | #include <openssl/err.h> |
74 | 72 | ||
diff --git a/src/lib/libcrypto/bio/bss_mem.c b/src/lib/libcrypto/bio/bss_mem.c index 849a2d05ce..8310f8cf4d 100644 --- a/src/lib/libcrypto/bio/bss_mem.c +++ b/src/lib/libcrypto/bio/bss_mem.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bss_mem.c,v 1.12 2014/07/10 13:58:22 jsing Exp $ */ | 1 | /* $OpenBSD: bss_mem.c,v 1.13 2014/07/11 08:44:47 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,8 +60,9 @@ | |||
60 | #include <stdio.h> | 60 | #include <stdio.h> |
61 | #include <string.h> | 61 | #include <string.h> |
62 | 62 | ||
63 | #include "cryptlib.h" | ||
64 | #include <openssl/bio.h> | 63 | #include <openssl/bio.h> |
64 | #include <openssl/err.h> | ||
65 | #include <openssl/buffer.h> | ||
65 | 66 | ||
66 | static int mem_write(BIO *h, const char *buf, int num); | 67 | static int mem_write(BIO *h, const char *buf, int num); |
67 | static int mem_read(BIO *h, char *buf, int size); | 68 | static int mem_read(BIO *h, char *buf, int size); |
diff --git a/src/lib/libcrypto/bio/bss_null.c b/src/lib/libcrypto/bio/bss_null.c index 226076e13a..42ee626b13 100644 --- a/src/lib/libcrypto/bio/bss_null.c +++ b/src/lib/libcrypto/bio/bss_null.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bss_null.c,v 1.9 2014/07/10 13:58:22 jsing Exp $ */ | 1 | /* $OpenBSD: bss_null.c,v 1.10 2014/07/11 08:44:47 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,7 +60,6 @@ | |||
60 | #include <stdio.h> | 60 | #include <stdio.h> |
61 | #include <string.h> | 61 | #include <string.h> |
62 | 62 | ||
63 | #include "cryptlib.h" | ||
64 | #include <openssl/bio.h> | 63 | #include <openssl/bio.h> |
65 | 64 | ||
66 | static int null_write(BIO *h, const char *buf, int num); | 65 | static int null_write(BIO *h, const char *buf, int num); |
diff --git a/src/lib/libcrypto/bio/bss_sock.c b/src/lib/libcrypto/bio/bss_sock.c index ced988f97a..dd470eb65e 100644 --- a/src/lib/libcrypto/bio/bss_sock.c +++ b/src/lib/libcrypto/bio/bss_sock.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bss_sock.c,v 1.22 2014/07/10 13:58:22 jsing Exp $ */ | 1 | /* $OpenBSD: bss_sock.c,v 1.23 2014/07/11 08:44:47 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 | * |
@@ -63,8 +63,6 @@ | |||
63 | #include <string.h> | 63 | #include <string.h> |
64 | #include <unistd.h> | 64 | #include <unistd.h> |
65 | 65 | ||
66 | #include "cryptlib.h" | ||
67 | |||
68 | #include <openssl/bio.h> | 66 | #include <openssl/bio.h> |
69 | 67 | ||
70 | static int sock_write(BIO *h, const char *buf, int num); | 68 | static int sock_write(BIO *h, const char *buf, int num); |