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/pkcs12/p12_key.c  | 4 +++-
 src/lib/libcrypto/pkcs12/p12_mutl.c | 6 ++++--
 src/lib/libcrypto/pkcs12/p12_utl.c  | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

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

diff --git a/src/lib/libcrypto/pkcs12/p12_key.c b/src/lib/libcrypto/pkcs12/p12_key.c
index ff69b8ebc5..379108f4b5 100644
--- a/src/lib/libcrypto/pkcs12/p12_key.c
+++ b/src/lib/libcrypto/pkcs12/p12_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_key.c,v 1.18 2014/07/10 12:09:43 jsing Exp $ */
+/* $OpenBSD: p12_key.c,v 1.19 2014/07/10 13:58:23 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -57,6 +57,8 @@
  */
 
 #include <stdio.h>
+#include <string.h>
+
 #include "cryptlib.h"
 #include <openssl/pkcs12.h>
 #include <openssl/bn.h>
diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c
index 7a2fab1666..fabc96e858 100644
--- a/src/lib/libcrypto/pkcs12/p12_mutl.c
+++ b/src/lib/libcrypto/pkcs12/p12_mutl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_mutl.c,v 1.14 2014/07/08 09:24:53 jsing Exp $ */
+/* $OpenBSD: p12_mutl.c,v 1.15 2014/07/10 13:58:23 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -56,8 +56,10 @@
  *
  */
 
-#ifndef OPENSSL_NO_HMAC
 #include <stdio.h>
+#include <string.h>
+
+#ifndef OPENSSL_NO_HMAC
 #include "cryptlib.h"
 #include <openssl/hmac.h>
 #include <openssl/rand.h>
diff --git a/src/lib/libcrypto/pkcs12/p12_utl.c b/src/lib/libcrypto/pkcs12/p12_utl.c
index 618e6c699f..712e16cf99 100644
--- a/src/lib/libcrypto/pkcs12/p12_utl.c
+++ b/src/lib/libcrypto/pkcs12/p12_utl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_utl.c,v 1.10 2014/07/08 09:24:53 jsing Exp $ */
+/* $OpenBSD: p12_utl.c,v 1.11 2014/07/10 13:58:23 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -57,6 +57,8 @@
  */
 
 #include <stdio.h>
+#include <string.h>
+
 #include "cryptlib.h"
 #include <openssl/pkcs12.h>
 
-- 
cgit v1.2.3-55-g6feb