diff options
author | Richard Levitte <levitte@openssl.org> | 2015-05-14 16:56:48 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2015-05-14 17:21:40 +0200 |
commit | b39fc560612984e65ec30d7f37487303bf514fb3 (patch) | |
tree | 10f33004ee5a296367ea155344287b9d29c05616 /crypto/pkcs12 | |
parent | 7a05eaac5e15e327b7c51258bf892c8ae5b1d956 (diff) |
Identify and move common internal libcrypto header files
There are header files in crypto/ that are used by a number of crypto/
submodules. Move those to crypto/include/internal and adapt the
affected source code and Makefiles.
The header files that got moved are:
crypto/cryptolib.h
crypto/md32_common.h
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/pkcs12')
-rw-r--r-- | crypto/pkcs12/p12_add.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_asn.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_attr.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_crpt.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_crt.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_decr.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_init.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_key.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_kiss.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_mutl.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_p8d.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_p8e.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_utl.c | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c index 301fed65f9..29abe2e1a4 100644 --- a/crypto/pkcs12/p12_add.c +++ b/crypto/pkcs12/p12_add.c @@ -58,7 +58,7 @@ */ #include <stdio.h> -#include "cryptlib.h" +#include "internal/cryptlib.h" #include <openssl/pkcs12.h> /* Pack an object into an OCTET STRING and turn into a safebag */ diff --git a/crypto/pkcs12/p12_asn.c b/crypto/pkcs12/p12_asn.c index 370ddbd6e7..ef2e851a6f 100644 --- a/crypto/pkcs12/p12_asn.c +++ b/crypto/pkcs12/p12_asn.c @@ -58,7 +58,7 @@ */ #include <stdio.h> -#include "cryptlib.h" +#include "internal/cryptlib.h" #include <openssl/asn1t.h> #include <openssl/pkcs12.h> diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c index 365a1cdff6..80abf66d41 100644 --- a/crypto/pkcs12/p12_attr.c +++ b/crypto/pkcs12/p12_attr.c @@ -58,7 +58,7 @@ */ #include <stdio.h> -#include "cryptlib.h" +#include "internal/cryptlib.h" #include <openssl/pkcs12.h> /* Add a local keyid to a safebag */ diff --git a/crypto/pkcs12/p12_crpt.c b/crypto/pkcs12/p12_crpt.c index e50096befd..08be40c61f 100644 --- a/crypto/pkcs12/p12_crpt.c +++ b/crypto/pkcs12/p12_crpt.c @@ -58,7 +58,7 @@ */ #include <stdio.h> -#include "cryptlib.h" +#include "internal/cryptlib.h" #include <openssl/pkcs12.h> /* PKCS#12 PBE algorithms now in static table */ diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c index cc254109da..189e7c7559 100644 --- a/crypto/pkcs12/p12_crt.c +++ b/crypto/pkcs12/p12_crt.c @@ -58,7 +58,7 @@ */ #include <stdio.h> -#include "cryptlib.h" +#include "internal/cryptlib.h" #include <openssl/pkcs12.h> static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c index 5154e545fe..f19830cf73 100644 --- a/crypto/pkcs12/p12_decr.c +++ b/crypto/pkcs12/p12_decr.c @@ -58,7 +58,7 @@ */ #include <stdio.h> -#include "cryptlib.h" +#include "internal/cryptlib.h" #include <openssl/pkcs12.h> /* Define this to dump decrypted output to files called DERnnn */ diff --git a/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c index 29f98316bf..3f1a07c000 100644 --- a/crypto/pkcs12/p12_init.c +++ b/crypto/pkcs12/p12_init.c @@ -58,7 +58,7 @@ */ #include <stdio.h> -#include "cryptlib.h" +#include "internal/cryptlib.h" #include <openssl/pkcs12.h> /* Initialise a PKCS12 structure to take data */ diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c index 45cac04ac6..879f157be0 100644 --- a/crypto/pkcs12/p12_key.c +++ b/crypto/pkcs12/p12_key.c @@ -58,7 +58,7 @@ */ #include <stdio.h> -#include "cryptlib.h" +#include "internal/cryptlib.h" #include <openssl/pkcs12.h> #include <openssl/bn.h> diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c index a2dbc42eab..a70fe72d09 100644 --- a/crypto/pkcs12/p12_kiss.c +++ b/crypto/pkcs12/p12_kiss.c @@ -58,7 +58,7 @@ */ #include <stdio.h> -#include "cryptlib.h" +#include "internal/cryptlib.h" #include <openssl/pkcs12.h> /* Simplified PKCS#12 routines */ diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c index b193da1b3d..4025e3fc41 100644 --- a/crypto/pkcs12/p12_mutl.c +++ b/crypto/pkcs12/p12_mutl.c @@ -58,7 +58,7 @@ */ # include <stdio.h> -# include "cryptlib.h" +# include "internal/cryptlib.h" # include <openssl/hmac.h> # include <openssl/rand.h> # include <openssl/pkcs12.h> diff --git a/crypto/pkcs12/p12_p8d.c b/crypto/pkcs12/p12_p8d.c index 3cc7a9f40e..983eadf43e 100644 --- a/crypto/pkcs12/p12_p8d.c +++ b/crypto/pkcs12/p12_p8d.c @@ -58,7 +58,7 @@ */ #include <stdio.h> -#include "cryptlib.h" +#include "internal/cryptlib.h" #include <openssl/pkcs12.h> PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *p8, const char *pass, diff --git a/crypto/pkcs12/p12_p8e.c b/crypto/pkcs12/p12_p8e.c index 9375cbfc56..46ed78a12f 100644 --- a/crypto/pkcs12/p12_p8e.c +++ b/crypto/pkcs12/p12_p8e.c @@ -58,7 +58,7 @@ */ #include <stdio.h> -#include "cryptlib.h" +#include "internal/cryptlib.h" #include <openssl/pkcs12.h> X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, diff --git a/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c index c55a4f18c9..5656cdc20a 100644 --- a/crypto/pkcs12/p12_utl.c +++ b/crypto/pkcs12/p12_utl.c @@ -58,7 +58,7 @@ */ #include <stdio.h> -#include "cryptlib.h" +#include "internal/cryptlib.h" #include <openssl/pkcs12.h> /* Cheap and nasty Unicode stuff */ |