diff options
author | Bodo Möller <bodo@openssl.org> | 1999-04-23 22:13:45 +0000 |
---|---|---|
committer | Bodo Möller <bodo@openssl.org> | 1999-04-23 22:13:45 +0000 |
commit | ec577822f95a8bca0023c5c77cef1a4916822d4a (patch) | |
tree | 206e75c0178ff0719b87a4d94e261fc243ce42a8 /crypto/pkcs12 | |
parent | 806115771c7a056756cb5f93bb3aaa71cd418e49 (diff) |
Change #include filenames from <foo.h> to <openssl.h>.
Submitted by:
Reviewed by:
PR:
Diffstat (limited to 'crypto/pkcs12')
-rw-r--r-- | crypto/pkcs12/Makefile.ssl | 6 | ||||
-rw-r--r-- | crypto/pkcs12/p12_add.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_attr.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_bags.c | 4 | ||||
-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_lib.c | 4 | ||||
-rw-r--r-- | crypto/pkcs12/p12_mac.c | 4 | ||||
-rw-r--r-- | crypto/pkcs12/p12_mutl.c | 6 | ||||
-rw-r--r-- | crypto/pkcs12/p12_sbag.c | 4 | ||||
-rw-r--r-- | crypto/pkcs12/p12_utl.c | 2 | ||||
-rw-r--r-- | crypto/pkcs12/pk12err.c | 4 | ||||
-rw-r--r-- | crypto/pkcs12/pkcs12.h | 4 |
17 files changed, 27 insertions, 27 deletions
diff --git a/crypto/pkcs12/Makefile.ssl b/crypto/pkcs12/Makefile.ssl index e6e06a5b46..98c9b751d7 100644 --- a/crypto/pkcs12/Makefile.ssl +++ b/crypto/pkcs12/Makefile.ssl @@ -53,15 +53,15 @@ files: links: @$(TOP)/util/point.sh Makefile.ssl Makefile - @$(TOP)/util/mklink.sh ../../include $(EXHEADER) + @$(TOP)/util/mklink.sh ../../include/openssl $(EXHEADER) @$(TOP)/util/mklink.sh ../../test $(TEST) @$(TOP)/util/mklink.sh ../../apps $(APPS) install: @for i in $(EXHEADER) ; \ do \ - (cp $$i $(INSTALLTOP)/include/$$i; \ - chmod 644 $(INSTALLTOP)/include/$$i ); \ + (cp $$i $(INSTALLTOP)/include/openssl/$$i; \ + chmod 644 $(INSTALLTOP)/include/openssl/$$i ); \ done; tags: diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c index de394454c9..3e203a1030 100644 --- a/crypto/pkcs12/p12_add.c +++ b/crypto/pkcs12/p12_add.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "pkcs12.h" +#include <openssl/pkcs12.h> /* Pack an object into an OCTET STRING and turn into a safebag */ diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c index c7d13c6219..220d7a67ea 100644 --- a/crypto/pkcs12/p12_attr.c +++ b/crypto/pkcs12/p12_attr.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "pkcs12.h" +#include <openssl/pkcs12.h> /* Add a local keyid to a safebag */ diff --git a/crypto/pkcs12/p12_bags.c b/crypto/pkcs12/p12_bags.c index 9a31502e35..5d65f6d119 100644 --- a/crypto/pkcs12/p12_bags.c +++ b/crypto/pkcs12/p12_bags.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "pkcs12.h" +#include <openssl/asn1_mac.h> +#include <openssl/pkcs12.h> /* *ASN1err(ASN1_F_PKCS12_BAGS_NEW,ASN1_R_DECODE_ERROR) diff --git a/crypto/pkcs12/p12_crpt.c b/crypto/pkcs12/p12_crpt.c index 8a6fedaeab..137d7cd360 100644 --- a/crypto/pkcs12/p12_crpt.c +++ b/crypto/pkcs12/p12_crpt.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "pkcs12.h" +#include <openssl/pkcs12.h> /* PKCS#12 specific PBE functions */ diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c index 86445278aa..cf630765bd 100644 --- a/crypto/pkcs12/p12_crt.c +++ b/crypto/pkcs12/p12_crt.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "pkcs12.h" +#include <openssl/pkcs12.h> PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, STACK *ca, int nid_key, int nid_cert, int iter, int mac_iter, diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c index 7973a69c2c..53fb8aad0f 100644 --- a/crypto/pkcs12/p12_decr.c +++ b/crypto/pkcs12/p12_decr.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "pkcs12.h" +#include <openssl/pkcs12.h> /* Define this to dump decrypted output to files called DERnnn */ /*#define DEBUG_DECRYPT*/ diff --git a/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c index 5301bd63f0..dc6ab41db8 100644 --- a/crypto/pkcs12/p12_init.c +++ b/crypto/pkcs12/p12_init.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "pkcs12.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 b59ac2b2d1..ff41f12aa0 100644 --- a/crypto/pkcs12/p12_key.c +++ b/crypto/pkcs12/p12_key.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "pkcs12.h" +#include <openssl/pkcs12.h> /* Uncomment out this line to get debugging info about key generation */ diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c index 9c40305534..63e5543467 100644 --- a/crypto/pkcs12/p12_kiss.c +++ b/crypto/pkcs12/p12_kiss.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "pkcs12.h" +#include <openssl/pkcs12.h> /* Simplified PKCS#12 routines */ diff --git a/crypto/pkcs12/p12_lib.c b/crypto/pkcs12/p12_lib.c index bb8e671694..84228b8bd4 100644 --- a/crypto/pkcs12/p12_lib.c +++ b/crypto/pkcs12/p12_lib.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "pkcs12.h" +#include <openssl/asn1_mac.h> +#include <openssl/pkcs12.h> /* *ASN1err(ASN1_F_PKCS12_NEW,ASN1_R_DECODE_ERROR) diff --git a/crypto/pkcs12/p12_mac.c b/crypto/pkcs12/p12_mac.c index 22497b9c98..20e79bd78f 100644 --- a/crypto/pkcs12/p12_mac.c +++ b/crypto/pkcs12/p12_mac.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "pkcs12.h" +#include <openssl/asn1_mac.h> +#include <openssl/pkcs12.h> /* *ASN1err(ASN1_F_PKCS12_MAC_DATA_NEW,ASN1_R_DECODE_ERROR) *ASN1err(ASN1_F_D2I_PKCS12_MAC_DATA,ASN1_R_DECODE_ERROR) diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c index 1699619cf3..2e9c31d97a 100644 --- a/crypto/pkcs12/p12_mutl.c +++ b/crypto/pkcs12/p12_mutl.c @@ -58,9 +58,9 @@ #include <stdio.h> #include "cryptlib.h" -#include "hmac.h" -#include "rand.h" -#include "pkcs12.h" +#include <openssl/hmac.h> +#include <openssl/rand.h> +#include <openssl/pkcs12.h> /* Generate a MAC */ int PKCS12_gen_mac (PKCS12 *p12, const char *pass, int passlen, diff --git a/crypto/pkcs12/p12_sbag.c b/crypto/pkcs12/p12_sbag.c index 4a2a32c721..ab8575a427 100644 --- a/crypto/pkcs12/p12_sbag.c +++ b/crypto/pkcs12/p12_sbag.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "pkcs12.h" +#include <openssl/asn1_mac.h> +#include <openssl/pkcs12.h> /* *ASN1err(ASN1_F_PKCS12_SAFEBAG_NEW,ASN1_R_DECODE_ERROR) diff --git a/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c index 2f89e97890..8dccd9e97c 100644 --- a/crypto/pkcs12/p12_utl.c +++ b/crypto/pkcs12/p12_utl.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "pkcs12.h" +#include <openssl/pkcs12.h> /* Cheap and nasty Unicode stuff */ diff --git a/crypto/pkcs12/pk12err.c b/crypto/pkcs12/pk12err.c index 336ed2cebd..7fd239087e 100644 --- a/crypto/pkcs12/pk12err.c +++ b/crypto/pkcs12/pk12err.c @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ #include <stdio.h> -#include "err.h" -#include "pkcs12.h" +#include <openssl/err.h> +#include <openssl/pkcs12.h> /* BEGIN ERROR CODES */ #ifndef NO_ERR diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h index 9bf211ef44..64f6449985 100644 --- a/crypto/pkcs12/pkcs12.h +++ b/crypto/pkcs12/pkcs12.h @@ -63,8 +63,8 @@ extern "C" { #endif -#include "bio.h" -#include "x509.h" +#include <openssl/bio.h> +#include <openssl/x509.h> #define PKCS12_KEY_ID 1 #define PKCS12_IV_ID 2 |