diff options
| author | jsing <> | 2014-07-10 13:58:23 +0000 |
|---|---|---|
| committer | jsing <> | 2014-07-10 13:58:23 +0000 |
| commit | f8e6fe02fc43958d79cf9326eebabf8ef8d3ae34 (patch) | |
| tree | 520bd0eaa8855b175013ab92f4175f47f1099115 /src/lib/libcrypto/pkcs12 | |
| parent | a2a7393cf3489febec569cfa8aab8735e4f58339 (diff) | |
| download | openbsd-f8e6fe02fc43958d79cf9326eebabf8ef8d3ae34.tar.gz openbsd-f8e6fe02fc43958d79cf9326eebabf8ef8d3ae34.tar.bz2 openbsd-f8e6fe02fc43958d79cf9326eebabf8ef8d3ae34.zip | |
Stop including standard headers via cryptlib.h - pull in the headers that
are needed in the source files that actually require them.
ok beck@ miod@
Diffstat (limited to 'src/lib/libcrypto/pkcs12')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_key.c | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_mutl.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_utl.c | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_key.c b/src/lib/libcrypto/pkcs12/p12_key.c index ff69b8ebc5..379108f4b5 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.18 2014/07/10 12:09:43 jsing Exp $ */ | 1 | /* $OpenBSD: p12_key.c,v 1.19 2014/07/10 13:58:23 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 | */ |
| @@ -57,6 +57,8 @@ | |||
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include <string.h> | ||
| 61 | |||
| 60 | #include "cryptlib.h" | 62 | #include "cryptlib.h" |
| 61 | #include <openssl/pkcs12.h> | 63 | #include <openssl/pkcs12.h> |
| 62 | #include <openssl/bn.h> | 64 | #include <openssl/bn.h> |
diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c index 7a2fab1666..fabc96e858 100644 --- a/src/lib/libcrypto/pkcs12/p12_mutl.c +++ b/src/lib/libcrypto/pkcs12/p12_mutl.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: p12_mutl.c,v 1.14 2014/07/08 09:24:53 jsing Exp $ */ | 1 | /* $OpenBSD: p12_mutl.c,v 1.15 2014/07/10 13:58:23 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 | */ |
| @@ -56,8 +56,10 @@ | |||
| 56 | * | 56 | * |
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #ifndef OPENSSL_NO_HMAC | ||
| 60 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include <string.h> | ||
| 61 | |||
| 62 | #ifndef OPENSSL_NO_HMAC | ||
| 61 | #include "cryptlib.h" | 63 | #include "cryptlib.h" |
| 62 | #include <openssl/hmac.h> | 64 | #include <openssl/hmac.h> |
| 63 | #include <openssl/rand.h> | 65 | #include <openssl/rand.h> |
diff --git a/src/lib/libcrypto/pkcs12/p12_utl.c b/src/lib/libcrypto/pkcs12/p12_utl.c index 618e6c699f..712e16cf99 100644 --- a/src/lib/libcrypto/pkcs12/p12_utl.c +++ b/src/lib/libcrypto/pkcs12/p12_utl.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: p12_utl.c,v 1.10 2014/07/08 09:24:53 jsing Exp $ */ | 1 | /* $OpenBSD: p12_utl.c,v 1.11 2014/07/10 13:58:23 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 | */ |
| @@ -57,6 +57,8 @@ | |||
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include <string.h> | ||
| 61 | |||
| 60 | #include "cryptlib.h" | 62 | #include "cryptlib.h" |
| 61 | #include <openssl/pkcs12.h> | 63 | #include <openssl/pkcs12.h> |
| 62 | 64 | ||