From c917c683bc93c68fbf4310ac181f7906e76b3c94 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/engine/eng_cnf.c     | 4 +++-
 src/lib/libcrypto/engine/eng_ctrl.c    | 4 +++-
 src/lib/libcrypto/engine/eng_dyn.c     | 3 ++-
 src/lib/libcrypto/engine/eng_fat.c     | 4 +++-
 src/lib/libcrypto/engine/eng_lib.c     | 4 +++-
 src/lib/libcrypto/engine/eng_list.c    | 5 ++++-
 src/lib/libcrypto/engine/eng_openssl.c | 5 +++--
 src/lib/libcrypto/engine/tb_asnmth.c   | 4 +++-
 8 files changed, 24 insertions(+), 9 deletions(-)

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

diff --git a/src/lib/libcrypto/engine/eng_cnf.c b/src/lib/libcrypto/engine/eng_cnf.c
index 1689bf44d2..d9cc5986db 100644
--- a/src/lib/libcrypto/engine/eng_cnf.c
+++ b/src/lib/libcrypto/engine/eng_cnf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_cnf.c,v 1.11 2014/06/22 11:33:47 jsing Exp $ */
+/* $OpenBSD: eng_cnf.c,v 1.12 2014/07/10 13:58:22 jsing Exp $ */
 /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -56,6 +56,8 @@
  *
  */
 
+#include <string.h>
+
 #include "eng_int.h"
 #include <openssl/conf.h>
 
diff --git a/src/lib/libcrypto/engine/eng_ctrl.c b/src/lib/libcrypto/engine/eng_ctrl.c
index d1f43e1949..ea31bfc582 100644
--- a/src/lib/libcrypto/engine/eng_ctrl.c
+++ b/src/lib/libcrypto/engine/eng_ctrl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_ctrl.c,v 1.8 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: eng_ctrl.c,v 1.9 2014/07/10 13:58:22 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2001 The OpenSSL Project.  All rights reserved.
  *
@@ -53,6 +53,8 @@
  *
  */
 
+#include <string.h>
+
 #include "eng_int.h"
 
 /* When querying a ENGINE-specific control command's 'description', this string
diff --git a/src/lib/libcrypto/engine/eng_dyn.c b/src/lib/libcrypto/engine/eng_dyn.c
index 05adf0d6ac..ec2ad7a8e7 100644
--- a/src/lib/libcrypto/engine/eng_dyn.c
+++ b/src/lib/libcrypto/engine/eng_dyn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_dyn.c,v 1.10 2014/07/09 08:52:00 bcook Exp $ */
+/* $OpenBSD: eng_dyn.c,v 1.11 2014/07/10 13:58:22 jsing Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2001.
  */
@@ -56,6 +56,7 @@
  *
  */
 
+#include <string.h>
 
 #include "eng_int.h"
 #include <openssl/dso.h>
diff --git a/src/lib/libcrypto/engine/eng_fat.c b/src/lib/libcrypto/engine/eng_fat.c
index 94190ca7f1..d995104a7c 100644
--- a/src/lib/libcrypto/engine/eng_fat.c
+++ b/src/lib/libcrypto/engine/eng_fat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_fat.c,v 1.12 2014/06/22 11:33:47 jsing Exp $ */
+/* $OpenBSD: eng_fat.c,v 1.13 2014/07/10 13:58:22 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2001 The OpenSSL Project.  All rights reserved.
  *
@@ -58,6 +58,8 @@
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
+#include <string.h>
+
 #include "eng_int.h"
 #include <openssl/conf.h>
 
diff --git a/src/lib/libcrypto/engine/eng_lib.c b/src/lib/libcrypto/engine/eng_lib.c
index 569b7199ce..118fa6cb9c 100644
--- a/src/lib/libcrypto/engine/eng_lib.c
+++ b/src/lib/libcrypto/engine/eng_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_lib.c,v 1.8 2014/06/22 12:05:09 jsing Exp $ */
+/* $OpenBSD: eng_lib.c,v 1.9 2014/07/10 13:58:22 jsing Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -56,6 +56,8 @@
  *
  */
 
+#include <string.h>
+
 #include "eng_int.h"
 #include <openssl/rand.h>
 
diff --git a/src/lib/libcrypto/engine/eng_list.c b/src/lib/libcrypto/engine/eng_list.c
index dddbaf0cc0..d7aef43999 100644
--- a/src/lib/libcrypto/engine/eng_list.c
+++ b/src/lib/libcrypto/engine/eng_list.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_list.c,v 1.12 2014/06/29 00:52:18 deraadt Exp $ */
+/* $OpenBSD: eng_list.c,v 1.13 2014/07/10 13:58:22 jsing Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -61,6 +61,9 @@
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
+#include <string.h>
+#include <unistd.h>
+
 #include "eng_int.h"
 
 /* The linked-list of pointers to engine types. engine_list_head
diff --git a/src/lib/libcrypto/engine/eng_openssl.c b/src/lib/libcrypto/engine/eng_openssl.c
index 9ba61dd842..882af0341f 100644
--- a/src/lib/libcrypto/engine/eng_openssl.c
+++ b/src/lib/libcrypto/engine/eng_openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_openssl.c,v 1.6 2014/06/22 12:05:09 jsing Exp $ */
+/* $OpenBSD: eng_openssl.c,v 1.7 2014/07/10 13:58:22 jsing Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -61,8 +61,9 @@
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
-
 #include <stdio.h>
+#include <string.h>
+
 #include <openssl/crypto.h>
 #include "cryptlib.h"
 #include <openssl/engine.h>
diff --git a/src/lib/libcrypto/engine/tb_asnmth.c b/src/lib/libcrypto/engine/tb_asnmth.c
index 412665cd9e..d43eea5447 100644
--- a/src/lib/libcrypto/engine/tb_asnmth.c
+++ b/src/lib/libcrypto/engine/tb_asnmth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tb_asnmth.c,v 1.3 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: tb_asnmth.c,v 1.4 2014/07/10 13:58:22 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
  *
@@ -53,6 +53,8 @@
  *
  */
 
+#include <string.h>
+
 #include "eng_int.h"
 #include "asn1_locl.h"
 #include <openssl/evp.h>
-- 
cgit v1.2.3-55-g6feb