From 74e2c009c83ad374bd6acdcfc376a384e25ab007 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/srp/srp_lib.c |  9 +++++----
 src/lib/libcrypto/srp/srp_vfy.c | 11 ++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

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

diff --git a/src/lib/libcrypto/srp/srp_lib.c b/src/lib/libcrypto/srp/srp_lib.c
index 078296fa0a..1e96adc6a3 100644
--- a/src/lib/libcrypto/srp/srp_lib.c
+++ b/src/lib/libcrypto/srp/srp_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: srp_lib.c,v 1.8 2014/07/10 22:45:58 jsing Exp $ */
+/* $OpenBSD: srp_lib.c,v 1.9 2014/07/11 08:44:49 jsing Exp $ */
 /* Written by Christophe Renou (christophe.renou@edelweb.fr) with 
  * the precious help of Peter Sylvester (peter.sylvester@edelweb.fr) 
  * for the EdelKey project and contributed to the OpenSSL project 2004.
@@ -60,10 +60,11 @@
 #include <openssl/opensslconf.h>
 
 #ifndef OPENSSL_NO_SRP
-#include "cryptlib.h"
-#include "srp_lcl.h"
-#include <openssl/srp.h>
+
 #include <openssl/evp.h>
+#include <openssl/srp.h>
+
+#include "srp_lcl.h"
 
 #if (BN_BYTES == 8)
 # if defined(_LP64)
diff --git a/src/lib/libcrypto/srp/srp_vfy.c b/src/lib/libcrypto/srp/srp_vfy.c
index 756744609a..0981890086 100644
--- a/src/lib/libcrypto/srp/srp_vfy.c
+++ b/src/lib/libcrypto/srp/srp_vfy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: srp_vfy.c,v 1.6 2014/07/10 22:45:58 jsing Exp $ */
+/* $OpenBSD: srp_vfy.c,v 1.7 2014/07/11 08:44:49 jsing Exp $ */
 /* Written by Christophe Renou (christophe.renou@edelweb.fr) with 
  * the precious help of Peter Sylvester (peter.sylvester@edelweb.fr) 
  * for the EdelKey project and contributed to the OpenSSL project 2004.
@@ -60,14 +60,15 @@
 #include <openssl/opensslconf.h>
 
 #ifndef OPENSSL_NO_SRP
-#include "cryptlib.h"
-#include "srp_lcl.h"
-#include <openssl/srp.h>
-#include <openssl/evp.h>
+
 #include <openssl/buffer.h>
+#include <openssl/evp.h>
 #include <openssl/rand.h>
+#include <openssl/srp.h>
 #include <openssl/txt_db.h>
 
+#include "srp_lcl.h"
+
 #define SRP_RANDOM_SALT_LEN 20
 #define MAX_LEN 2500
 
-- 
cgit v1.2.3-55-g6feb