From 8c3482db610348be15fb633bb52b0511c2cabbcf Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 11 Jul 2014 08:44:49 +0000
Subject: 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@
---
 src/lib/libcrypto/buffer/buf_str.c | 5 +++--
 src/lib/libcrypto/buffer/buffer.c  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

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

diff --git a/src/lib/libcrypto/buffer/buf_str.c b/src/lib/libcrypto/buffer/buf_str.c
index 33836d0af4..f7e4c0b966 100644
--- a/src/lib/libcrypto/buffer/buf_str.c
+++ b/src/lib/libcrypto/buffer/buf_str.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buf_str.c,v 1.8 2014/04/26 13:07:16 jsing Exp $ */
+/* $OpenBSD: buf_str.c,v 1.9 2014/07/11 08:44:48 jsing Exp $ */
 /*
  * Copyright (c) 2014 Bob Beck
  *
@@ -18,8 +18,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "cryptlib.h"
+
 #include <openssl/buffer.h>
+#include <openssl/err.h>
 
 /*
  * XXX these functions accept a NULL arg and return NULL
diff --git a/src/lib/libcrypto/buffer/buffer.c b/src/lib/libcrypto/buffer/buffer.c
index af32cbf50b..ac3729d52b 100644
--- a/src/lib/libcrypto/buffer/buffer.c
+++ b/src/lib/libcrypto/buffer/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.20 2014/07/10 13:58:22 jsing Exp $ */
+/* $OpenBSD: buffer.c,v 1.21 2014/07/11 08:44:48 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,10 +57,11 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
-#include "cryptlib.h"
 #include <openssl/buffer.h>
+#include <openssl/err.h>
 
 /* LIMIT_BEFORE_EXPANSION is the maximum n such that (n+3)/3*4 < 2**31. That
  * function is applied in several functions in this file and this limit ensures
-- 
cgit v1.2.3-55-g6feb