diff options
author | jsing <> | 2014-07-11 08:44:49 +0000 |
---|---|---|
committer | jsing <> | 2014-07-11 08:44:49 +0000 |
commit | 8c3482db610348be15fb633bb52b0511c2cabbcf (patch) | |
tree | 0e726f9e971e00f4c8cd8afab71589803fc11b7f /src/lib/libcrypto/pkcs12/p12_key.c | |
parent | a336cdb63c1fe5d934826147bf5c19d317ced73b (diff) | |
download | openbsd-8c3482db610348be15fb633bb52b0511c2cabbcf.tar.gz openbsd-8c3482db610348be15fb633bb52b0511c2cabbcf.tar.bz2 openbsd-8c3482db610348be15fb633bb52b0511c2cabbcf.zip |
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 'src/lib/libcrypto/pkcs12/p12_key.c')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_key.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_key.c b/src/lib/libcrypto/pkcs12/p12_key.c index 379108f4b5..1f7583084e 100644 --- a/src/lib/libcrypto/pkcs12/p12_key.c +++ b/src/lib/libcrypto/pkcs12/p12_key.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p12_key.c,v 1.19 2014/07/10 13:58:23 jsing Exp $ */ | 1 | /* $OpenBSD: p12_key.c,v 1.20 2014/07/11 08:44:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -59,9 +59,9 @@ | |||
59 | #include <stdio.h> | 59 | #include <stdio.h> |
60 | #include <string.h> | 60 | #include <string.h> |
61 | 61 | ||
62 | #include "cryptlib.h" | ||
63 | #include <openssl/pkcs12.h> | ||
64 | #include <openssl/bn.h> | 62 | #include <openssl/bn.h> |
63 | #include <openssl/err.h> | ||
64 | #include <openssl/pkcs12.h> | ||
65 | 65 | ||
66 | /* PKCS12 compatible key/IV generation */ | 66 | /* PKCS12 compatible key/IV generation */ |
67 | #ifndef min | 67 | #ifndef min |