diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-07-11 08:44:50 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-07-11 08:44:50 +0000 |
| commit | 7262eba487248ace93831592b64babbfd9ffdf77 (patch) | |
| tree | 5c2e5b7e9e56e7b42163be504755f904bad6cb48 /lib/libcrypto/srp | |
| parent | 26e4c72fed0e35eecec27a1b3b1d1daa1559dc14 (diff) | |
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@
Diffstat (limited to 'lib/libcrypto/srp')
| -rw-r--r-- | lib/libcrypto/srp/srp_lib.c | 9 | ||||
| -rw-r--r-- | lib/libcrypto/srp/srp_vfy.c | 11 |
2 files changed, 11 insertions, 9 deletions
diff --git a/lib/libcrypto/srp/srp_lib.c b/lib/libcrypto/srp/srp_lib.c index 078296fa0a6..1e96adc6a38 100644 --- a/lib/libcrypto/srp/srp_lib.c +++ b/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/lib/libcrypto/srp/srp_vfy.c b/lib/libcrypto/srp/srp_vfy.c index 756744609a4..0981890086b 100644 --- a/lib/libcrypto/srp/srp_vfy.c +++ b/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 |