From f8e6fe02fc43958d79cf9326eebabf8ef8d3ae34 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 10 Jul 2014 13:58:23 +0000
Subject: Stop including standard headers via cryptlib.h - pull in the headers
 that are needed in the source files that actually require them.

ok beck@ miod@
---
 src/lib/libcrypto/bio/b_dump.c    |  3 ++-
 src/lib/libcrypto/bio/b_sock.c    |  3 ++-
 src/lib/libcrypto/bio/bf_buff.c   |  6 ++++--
 src/lib/libcrypto/bio/bss_acpt.c  | 10 ++++++----
 src/lib/libcrypto/bio/bss_conn.c  | 15 +++++++++------
 src/lib/libcrypto/bio/bss_dgram.c | 13 ++++++++-----
 src/lib/libcrypto/bio/bss_fd.c    |  6 ++++--
 src/lib/libcrypto/bio/bss_file.c  |  7 ++++---
 src/lib/libcrypto/bio/bss_log.c   | 11 ++++-------
 src/lib/libcrypto/bio/bss_mem.c   |  6 ++++--
 src/lib/libcrypto/bio/bss_null.c  |  6 ++++--
 src/lib/libcrypto/bio/bss_sock.c  | 10 ++++++----
 12 files changed, 57 insertions(+), 39 deletions(-)

(limited to 'src/lib/libcrypto/bio')

diff --git a/src/lib/libcrypto/bio/b_dump.c b/src/lib/libcrypto/bio/b_dump.c
index c379944804..62a6c269ac 100644
--- a/src/lib/libcrypto/bio/b_dump.c
+++ b/src/lib/libcrypto/bio/b_dump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: b_dump.c,v 1.17 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: b_dump.c,v 1.18 2014/07/10 13:58:22 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -61,6 +61,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/bio.h>
 
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c
index be8b555217..32ac3b0664 100644
--- a/src/lib/libcrypto/bio/b_sock.c
+++ b/src/lib/libcrypto/bio/b_sock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: b_sock.c,v 1.51 2014/07/10 09:33:45 bcook Exp $ */
+/* $OpenBSD: b_sock.c,v 1.52 2014/07/10 13:58:22 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -58,6 +58,7 @@
 
 #include <sys/ioctl.h>
 #include <sys/socket.h>
+#include <string.h>
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
diff --git a/src/lib/libcrypto/bio/bf_buff.c b/src/lib/libcrypto/bio/bf_buff.c
index 4aa5d39293..ea55e490be 100644
--- a/src/lib/libcrypto/bio/bf_buff.c
+++ b/src/lib/libcrypto/bio/bf_buff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bf_buff.c,v 1.19 2014/07/10 11:25:13 tedu Exp $ */
+/* $OpenBSD: bf_buff.c,v 1.20 2014/07/10 13:58:22 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,8 +56,10 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "cryptlib.h"
 #include <openssl/bio.h>
 
diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c
index 2011aefc54..580c52da6c 100644
--- a/src/lib/libcrypto/bio/bss_acpt.c
+++ b/src/lib/libcrypto/bio/bss_acpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_acpt.c,v 1.21 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bss_acpt.c,v 1.22 2014/07/10 13:58:22 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,13 +56,15 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
+#include <sys/socket.h>
+
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
 #include <unistd.h>
+
 #include "cryptlib.h"
 #include <openssl/bio.h>
-#include <sys/socket.h>
-
 
 #define SOCKET_PROTOCOL IPPROTO_TCP
 
diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c
index 0d29e428c9..d5763a0ce3 100644
--- a/src/lib/libcrypto/bio/bss_conn.c
+++ b/src/lib/libcrypto/bio/bss_conn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_conn.c,v 1.27 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bss_conn.c,v 1.28 2014/07/10 13:58:22 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,15 +56,18 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
 #include <errno.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <string.h>
 #include <unistd.h>
+
 #include "cryptlib.h"
 #include <openssl/bio.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
 
 #define SOCKET_PROTOCOL IPPROTO_TCP
 
diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c
index 0e0698d2ab..d06406aebd 100644
--- a/src/lib/libcrypto/bio/bss_dgram.c
+++ b/src/lib/libcrypto/bio/bss_dgram.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_dgram.c,v 1.28 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bss_dgram.c,v 1.29 2014/07/10 13:58:22 jsing Exp $ */
 /* 
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
@@ -57,15 +57,18 @@
  *
  */
 
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 
-#include <stdio.h>
 #include <errno.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <string.h>
 #include <unistd.h>
+
 #include "cryptlib.h"
 #include <openssl/bio.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 
 #ifndef OPENSSL_NO_DGRAM
 
diff --git a/src/lib/libcrypto/bio/bss_fd.c b/src/lib/libcrypto/bio/bss_fd.c
index ea4f59e1bd..60efde91c9 100644
--- a/src/lib/libcrypto/bio/bss_fd.c
+++ b/src/lib/libcrypto/bio/bss_fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_fd.c,v 1.14 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bss_fd.c,v 1.15 2014/07/10 13:58:22 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,9 +56,11 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
 #include <unistd.h>
+
 #include "cryptlib.h"
 
 #if defined(OPENSSL_NO_POSIX_IO)
diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c
index 70a85220e4..44345f3c70 100644
--- a/src/lib/libcrypto/bio/bss_file.c
+++ b/src/lib/libcrypto/bio/bss_file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_file.c,v 1.28 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bss_file.c,v 1.29 2014/07/10 13:58:22 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -83,13 +83,14 @@
 #endif
 #endif
 
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "cryptlib.h"
 #include <openssl/bio.h>
 #include <openssl/err.h>
 
-
 static int file_write(BIO *h, const char *buf, int num);
 static int file_read(BIO *h, char *buf, int size);
 static int file_puts(BIO *h, const char *str);
diff --git a/src/lib/libcrypto/bio/bss_log.c b/src/lib/libcrypto/bio/bss_log.c
index 0124f1403b..63361ce22f 100644
--- a/src/lib/libcrypto/bio/bss_log.c
+++ b/src/lib/libcrypto/bio/bss_log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_log.c,v 1.19 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bss_log.c,v 1.20 2014/07/10 13:58:22 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
  *
@@ -62,20 +62,18 @@
 
 */
 
-
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <syslog.h>
 
 #include "cryptlib.h"
 
-#include <syslog.h>
-
 #include <openssl/buffer.h>
 #include <openssl/err.h>
 
 #ifndef NO_SYSLOG
 
-
 static int slg_write(BIO *h, const char *buf, int num);
 static int slg_puts(BIO *h, const char *str);
 static long slg_ctrl(BIO *h, int cmd, long arg1, void *arg2);
@@ -214,5 +212,4 @@ xcloselog(BIO* bp)
 	closelog();
 }
 
-
 #endif /* NO_SYSLOG */
diff --git a/src/lib/libcrypto/bio/bss_mem.c b/src/lib/libcrypto/bio/bss_mem.c
index 9b40a6d4dc..849a2d05ce 100644
--- a/src/lib/libcrypto/bio/bss_mem.c
+++ b/src/lib/libcrypto/bio/bss_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_mem.c,v 1.11 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bss_mem.c,v 1.12 2014/07/10 13:58:22 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,8 +56,10 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "cryptlib.h"
 #include <openssl/bio.h>
 
diff --git a/src/lib/libcrypto/bio/bss_null.c b/src/lib/libcrypto/bio/bss_null.c
index 36a47a2145..226076e13a 100644
--- a/src/lib/libcrypto/bio/bss_null.c
+++ b/src/lib/libcrypto/bio/bss_null.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_null.c,v 1.8 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bss_null.c,v 1.9 2014/07/10 13:58:22 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,8 +56,10 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "cryptlib.h"
 #include <openssl/bio.h>
 
diff --git a/src/lib/libcrypto/bio/bss_sock.c b/src/lib/libcrypto/bio/bss_sock.c
index 238f5dc2de..ced988f97a 100644
--- a/src/lib/libcrypto/bio/bss_sock.c
+++ b/src/lib/libcrypto/bio/bss_sock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_sock.c,v 1.21 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: bss_sock.c,v 1.22 2014/07/10 13:58:22 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,12 +56,14 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
+#include <sys/socket.h>
+
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
 #include <unistd.h>
-#include "cryptlib.h"
-#include <sys/socket.h>
 
+#include "cryptlib.h"
 
 #include <openssl/bio.h>
 
-- 
cgit v1.2.3-55-g6feb