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/engine/eng_openssl.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/lib/libcrypto/engine/eng_openssl.c')

diff --git a/src/lib/libcrypto/engine/eng_openssl.c b/src/lib/libcrypto/engine/eng_openssl.c
index ecc560eb26..f1a58df857 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.8 2014/07/10 22:45:57 jsing Exp $ */
+/* $OpenBSD: eng_openssl.c,v 1.9 2014/07/11 08:44:48 jsing Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -67,20 +67,20 @@
 #include <openssl/opensslconf.h>
 
 #include <openssl/crypto.h>
-#include "cryptlib.h"
-#include <openssl/engine.h>
 #include <openssl/dso.h>
-#include <openssl/pem.h>
+#include <openssl/engine.h>
 #include <openssl/evp.h>
+#include <openssl/pem.h>
 #include <openssl/rand.h>
-#ifndef OPENSSL_NO_RSA
-#include <openssl/rsa.h>
+
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
 #endif
 #ifndef OPENSSL_NO_DSA
 #include <openssl/dsa.h>
 #endif
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
 #endif
 
 /* This testing gunk is implemented (and explained) lower down. It also assumes
-- 
cgit v1.2.3-55-g6feb