diff options
Diffstat (limited to 'crypto/asn1')
86 files changed, 208 insertions, 208 deletions
diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl index c6e1f2f8a4..df36d7312f 100644 --- a/crypto/asn1/Makefile.ssl +++ b/crypto/asn1/Makefile.ssl @@ -83,15 +83,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/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c index cd4d835003..d1d28bd9bb 100644 --- a/crypto/asn1/a_bitstr.c +++ b/crypto/asn1/a_bitstr.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1.h" +#include <openssl/asn1.h> /* ASN1err(ASN1_F_ASN1_STRING_NEW,ASN1_R_STRING_TOO_SHORT); * ASN1err(ASN1_F_D2I_ASN1_BIT_STRING,ASN1_R_EXPECTING_A_BIT_STRING); diff --git a/crypto/asn1/a_bmp.c b/crypto/asn1/a_bmp.c index 2cb322ab43..e492ab9ec0 100644 --- a/crypto/asn1/a_bmp.c +++ b/crypto/asn1/a_bmp.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1.h" +#include <openssl/asn1.h> /* ASN1err(ASN1_F_D2I_ASN1_BMPSTRING,ASN1_R_EXPECTING_AN_INTEGER); */ diff --git a/crypto/asn1/a_bool.c b/crypto/asn1/a_bool.c index fc55a92f48..711c57e5c0 100644 --- a/crypto/asn1/a_bool.c +++ b/crypto/asn1/a_bool.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1.h" +#include <openssl/asn1.h> /* ASN1err(ASN1_F_D2I_ASN1_BOOLEAN,ASN1_R_EXPECTING_A_BOOLEAN); * ASN1err(ASN1_F_D2I_ASN1_BOOLEAN,ASN1_R_BOOLEAN_IS_WRONG_LENGTH); diff --git a/crypto/asn1/a_bytes.c b/crypto/asn1/a_bytes.c index fdfe9ea8ef..153be36660 100644 --- a/crypto/asn1/a_bytes.c +++ b/crypto/asn1/a_bytes.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" +#include <openssl/asn1_mac.h> /* ASN1err(ASN1_F_D2I_ASN1_TYPE_BYTES,ASN1_R_WRONG_TYPE); * ASN1err(ASN1_F_ASN1_COLLATE_PRIMATIVE,ASN1_R_WRONG_TAG); diff --git a/crypto/asn1/a_d2i_fp.c b/crypto/asn1/a_d2i_fp.c index 465986eb63..a49d1cb289 100644 --- a/crypto/asn1/a_d2i_fp.c +++ b/crypto/asn1/a_d2i_fp.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "buffer.h" -#include "asn1_mac.h" +#include <openssl/buffer.h> +#include <openssl/asn1_mac.h> #define HEADER_SIZE 8 diff --git a/crypto/asn1/a_digest.c b/crypto/asn1/a_digest.c index 20cde71f03..f3de491665 100644 --- a/crypto/asn1/a_digest.c +++ b/crypto/asn1/a_digest.c @@ -62,9 +62,9 @@ #include <sys/stat.h> #include "cryptlib.h" -#include "evp.h" -#include "x509.h" -#include "buffer.h" +#include <openssl/evp.h> +#include <openssl/x509.h> +#include <openssl/buffer.h> int ASN1_digest(int (*i2d)(), EVP_MD *type, char *data, unsigned char *md, unsigned int *len) diff --git a/crypto/asn1/a_dup.c b/crypto/asn1/a_dup.c index cf5748296c..c0a8709f3b 100644 --- a/crypto/asn1/a_dup.c +++ b/crypto/asn1/a_dup.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" +#include <openssl/asn1_mac.h> #define READ_CHUNK 2048 diff --git a/crypto/asn1/a_enum.c b/crypto/asn1/a_enum.c index 0f8ad843c0..7ad863a4bc 100644 --- a/crypto/asn1/a_enum.c +++ b/crypto/asn1/a_enum.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1.h" +#include <openssl/asn1.h> /* Support for ASN1 ENUMERATED type: based on a_int.c */ diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c index 7992739cad..3952eaf170 100644 --- a/crypto/asn1/a_gentm.c +++ b/crypto/asn1/a_gentm.c @@ -61,7 +61,7 @@ #include <stdio.h> #include <time.h> #include "cryptlib.h" -#include "asn1.h" +#include <openssl/asn1.h> /* ASN1err(ASN1_F_ASN1_GENERALIZEDTIME_NEW,ASN1_R_GENERALIZEDTIME_TOO_LONG); * ASN1err(ASN1_F_D2I_ASN1_GENERALIZEDTIME,ASN1_R_EXPECTING_A_GENERALIZEDTIME); diff --git a/crypto/asn1/a_hdr.c b/crypto/asn1/a_hdr.c index d1bf08af4b..1d44b9d5a1 100644 --- a/crypto/asn1/a_hdr.c +++ b/crypto/asn1/a_hdr.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "asn1.h" +#include <openssl/asn1_mac.h> +#include <openssl/asn1.h> /* * ASN1err(ASN1_F_D2I_ASN1_HEADER,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/a_i2d_fp.c b/crypto/asn1/a_i2d_fp.c index f010ec1272..6bd845443c 100644 --- a/crypto/asn1/a_i2d_fp.c +++ b/crypto/asn1/a_i2d_fp.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "buffer.h" -#include "asn1_mac.h" +#include <openssl/buffer.h> +#include <openssl/asn1_mac.h> #ifndef NO_FP_API int ASN1_i2d_fp(int (*i2d)(), FILE *out, unsigned char *x) diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c index acfc855261..dcae5cce35 100644 --- a/crypto/asn1/a_int.c +++ b/crypto/asn1/a_int.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1.h" +#include <openssl/asn1.h> /* ASN1err(ASN1_F_D2I_ASN1_INTEGER,ASN1_R_EXPECTING_AN_INTEGER); */ diff --git a/crypto/asn1/a_meth.c b/crypto/asn1/a_meth.c index 961085578e..32c8693955 100644 --- a/crypto/asn1/a_meth.c +++ b/crypto/asn1/a_meth.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "buffer.h" -#include "x509.h" +#include <openssl/buffer.h> +#include <openssl/x509.h> static ASN1_METHOD ia5string_meth={ (int (*)()) i2d_ASN1_IA5STRING, diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c index ef77bb0d2d..9f9b2f04f2 100644 --- a/crypto/asn1/a_object.c +++ b/crypto/asn1/a_object.c @@ -58,9 +58,9 @@ #include <stdio.h> #include "cryptlib.h" -#include "buffer.h" -#include "asn1.h" -#include "objects.h" +#include <openssl/buffer.h> +#include <openssl/asn1.h> +#include <openssl/objects.h> /* ASN1err(ASN1_F_ASN1_OBJECT_NEW,ASN1_R_EXPECTING_AN_OBJECT); * ASN1err(ASN1_F_D2I_ASN1_OBJECT,ASN1_R_BAD_OBJECT_HEADER); diff --git a/crypto/asn1/a_octet.c b/crypto/asn1/a_octet.c index 2509175185..16cf8133af 100644 --- a/crypto/asn1/a_octet.c +++ b/crypto/asn1/a_octet.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1.h" +#include <openssl/asn1.h> /* ASN1err(ASN1_F_D2I_ASN1_OCTET_STRING,ASN1_R_EXPECTING_AN_OCTET_STRING); */ diff --git a/crypto/asn1/a_print.c b/crypto/asn1/a_print.c index babb571c5b..4e50f6ec8b 100644 --- a/crypto/asn1/a_print.c +++ b/crypto/asn1/a_print.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1.h" +#include <openssl/asn1.h> /* ASN1err(ASN1_F_D2I_ASN1_PRINT_TYPE,ASN1_R_WRONG_PRINTABLE_TYPE); * ASN1err(ASN1_F_D2I_ASN1_PRINT_TYPE,ASN1_R_TAG_VALUE_TOO_HIGH); diff --git a/crypto/asn1/a_set.c b/crypto/asn1/a_set.c index 406c68face..17c0a5f841 100644 --- a/crypto/asn1/a_set.c +++ b/crypto/asn1/a_set.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" +#include <openssl/asn1_mac.h> /* ASN1err(ASN1_F_ASN1_TYPE_NEW,ERR_R_MALLOC_FAILURE); */ diff --git a/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c index 7ce246c7cf..57595692e5 100644 --- a/crypto/asn1/a_sign.c +++ b/crypto/asn1/a_sign.c @@ -62,11 +62,11 @@ #include <sys/stat.h> #include "cryptlib.h" -#include "bn.h" -#include "evp.h" -#include "x509.h" -#include "objects.h" -#include "buffer.h" +#include <openssl/bn.h> +#include <openssl/evp.h> +#include <openssl/x509.h> +#include <openssl/objects.h> +#include <openssl/buffer.h> int ASN1_sign(int (*i2d)(), X509_ALGOR *algor1, X509_ALGOR *algor2, ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey, diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c index 495f0814a3..19bfdda7c4 100644 --- a/crypto/asn1/a_time.c +++ b/crypto/asn1/a_time.c @@ -64,7 +64,7 @@ #include <stdio.h> #include <time.h> #include "cryptlib.h" -#include "asn1.h" +#include <openssl/asn1.h> int i2d_ASN1_TIME(ASN1_TIME *a, unsigned char **pp) { diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c index 5ccd5de00e..c9b5e7d047 100644 --- a/crypto/asn1/a_type.c +++ b/crypto/asn1/a_type.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" +#include <openssl/asn1_mac.h> /* ASN1err(ASN1_F_D2I_ASN1_BYTES,ASN1_R_WRONG_TAG); * ASN1err(ASN1_F_ASN1_COLLATE_PRIMATIVE,ASN1_R_WRONG_TAG); diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c index 291c0fda69..5c5d8a1cab 100644 --- a/crypto/asn1/a_utctm.c +++ b/crypto/asn1/a_utctm.c @@ -59,7 +59,7 @@ #include <stdio.h> #include <time.h> #include "cryptlib.h" -#include "asn1.h" +#include <openssl/asn1.h> /* ASN1err(ASN1_F_ASN1_UTCTIME_NEW,ASN1_R_UTCTIME_TOO_LONG); * ASN1err(ASN1_F_D2I_ASN1_UTCTIME,ASN1_R_EXPECTING_A_UTCTIME); diff --git a/crypto/asn1/a_utf8.c b/crypto/asn1/a_utf8.c index 2babbe712d..70078b68f9 100644 --- a/crypto/asn1/a_utf8.c +++ b/crypto/asn1/a_utf8.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1.h" +#include <openssl/asn1.h> /* ASN1err(ASN1_F_D2I_ASN1_UTF8STRING,ERR_R_MALLOC_FAILURE); */ diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c index fc2711058b..6383d2c698 100644 --- a/crypto/asn1/a_verify.c +++ b/crypto/asn1/a_verify.c @@ -62,11 +62,11 @@ #include <sys/stat.h> #include "cryptlib.h" -#include "bn.h" -#include "x509.h" -#include "objects.h" -#include "buffer.h" -#include "evp.h" +#include <openssl/bn.h> +#include <openssl/x509.h> +#include <openssl/objects.h> +#include <openssl/buffer.h> +#include <openssl/evp.h> int ASN1_verify(int (*i2d)(), X509_ALGOR *a, ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey) diff --git a/crypto/asn1/a_vis.c b/crypto/asn1/a_vis.c index 2e5a709016..b47e4b3042 100644 --- a/crypto/asn1/a_vis.c +++ b/crypto/asn1/a_vis.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1.h" +#include <openssl/asn1.h> /* ASN1err(ASN1_F_D2I_ASN1_VISIBLESTRING,ERR_R_MALLOC_FAILURE); */ diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index 6b9062d5d0..4c38772efb 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -64,8 +64,8 @@ extern "C" { #endif #include <time.h> -#include "bn.h" -#include "stack.h" +#include <openssl/bn.h> +#include <openssl/stack.h> #define V_ASN1_UNIVERSAL 0x00 #define V_ASN1_APPLICATION 0x40 diff --git a/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c index 463500b40f..744135e935 100644 --- a/crypto/asn1/asn1_err.c +++ b/crypto/asn1/asn1_err.c @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ #include <stdio.h> -#include "err.h" -#include "asn1.h" +#include <openssl/err.h> +#include <openssl/asn1.h> /* BEGIN ERROR CODES */ #ifndef NO_ERR diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c index f67ed0fc86..628b864015 100644 --- a/crypto/asn1/asn1_lib.c +++ b/crypto/asn1/asn1_lib.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1.h" -#include "asn1_mac.h" +#include <openssl/asn1.h> +#include <openssl/asn1_mac.h> #ifndef NOPROTO static int asn1_get_length(unsigned char **pp,int *inf,long *rl,int max); diff --git a/crypto/asn1/asn1_mac.h b/crypto/asn1/asn1_mac.h index b7a90f820d..4d1731de7c 100644 --- a/crypto/asn1/asn1_mac.h +++ b/crypto/asn1/asn1_mac.h @@ -63,9 +63,9 @@ extern "C" { #endif -#include "asn1.h" -#include "x509.h" -#include "pkcs7.h" +#include <openssl/asn1.h> +#include <openssl/x509.h> +#include <openssl/pkcs7.h> #ifndef ASN1_MAC_ERR_LIB #define ASN1_MAC_ERR_LIB ERR_LIB_ASN1 diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c index ab5521a7b3..fd36b4c13d 100644 --- a/crypto/asn1/asn1_par.c +++ b/crypto/asn1/asn1_par.c @@ -58,9 +58,9 @@ #include <stdio.h> #include "cryptlib.h" -#include "buffer.h" -#include "objects.h" -#include "x509.h" +#include <openssl/buffer.h> +#include <openssl/objects.h> +#include <openssl/x509.h> #ifndef NOPROTO static int asn1_print_info(BIO *bp, int tag, int xclass,int constructed, diff --git a/crypto/asn1/asn_pack.c b/crypto/asn1/asn_pack.c index c094d64e1c..4e846285a8 100644 --- a/crypto/asn1/asn_pack.c +++ b/crypto/asn1/asn_pack.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1.h" +#include <openssl/asn1.h> /* ASN1 packing and unpacking functions */ diff --git a/crypto/asn1/d2i_dhp.c b/crypto/asn1/d2i_dhp.c index 4fea5af8e3..f76a9d4423 100644 --- a/crypto/asn1/d2i_dhp.c +++ b/crypto/asn1/d2i_dhp.c @@ -58,10 +58,10 @@ #include <stdio.h> #include "cryptlib.h" -#include "bn.h" -#include "dh.h" -#include "objects.h" -#include "asn1_mac.h" +#include <openssl/bn.h> +#include <openssl/dh.h> +#include <openssl/objects.h> +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_DHPARAMS,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/d2i_dsap.c b/crypto/asn1/d2i_dsap.c index 2f3b6b6a57..df48eda2f4 100644 --- a/crypto/asn1/d2i_dsap.c +++ b/crypto/asn1/d2i_dsap.c @@ -58,10 +58,10 @@ #include <stdio.h> #include "cryptlib.h" -#include "bn.h" -#include "dsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include <openssl/bn.h> +#include <openssl/dsa.h> +#include <openssl/objects.h> +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_DSAPARAMS,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c index 0fee334e77..43c7a3b917 100644 --- a/crypto/asn1/d2i_pr.c +++ b/crypto/asn1/d2i_pr.c @@ -58,10 +58,10 @@ #include <stdio.h> #include "cryptlib.h" -#include "bn.h" -#include "evp.h" -#include "objects.h" -#include "x509.h" +#include <openssl/bn.h> +#include <openssl/evp.h> +#include <openssl/objects.h> +#include <openssl/x509.h> EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, unsigned char **pp, long length) diff --git a/crypto/asn1/d2i_pu.c b/crypto/asn1/d2i_pu.c index d89c6e287c..eace9e88c7 100644 --- a/crypto/asn1/d2i_pu.c +++ b/crypto/asn1/d2i_pu.c @@ -58,10 +58,10 @@ #include <stdio.h> #include "cryptlib.h" -#include "bn.h" -#include "evp.h" -#include "objects.h" -#include "x509.h" +#include <openssl/bn.h> +#include <openssl/evp.h> +#include <openssl/objects.h> +#include <openssl/x509.h> EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, unsigned char **pp, long length) diff --git a/crypto/asn1/d2i_r_pr.c b/crypto/asn1/d2i_r_pr.c index 3a4267bf97..8e46efce8a 100644 --- a/crypto/asn1/d2i_r_pr.c +++ b/crypto/asn1/d2i_r_pr.c @@ -58,10 +58,10 @@ #include <stdio.h> #include "cryptlib.h" -#include "bn.h" -#include "rsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include <openssl/bn.h> +#include <openssl/rsa.h> +#include <openssl/objects.h> +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_RSAPRIVATEKEY,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/d2i_r_pu.c b/crypto/asn1/d2i_r_pu.c index 5a98e55930..6ccec8c9b6 100644 --- a/crypto/asn1/d2i_r_pu.c +++ b/crypto/asn1/d2i_r_pu.c @@ -58,10 +58,10 @@ #include <stdio.h> #include "cryptlib.h" -#include "bn.h" -#include "rsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include <openssl/bn.h> +#include <openssl/rsa.h> +#include <openssl/objects.h> +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_RSAPUBLICKEY,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/d2i_s_pr.c b/crypto/asn1/d2i_s_pr.c index b318b1e3b5..35fb3334e0 100644 --- a/crypto/asn1/d2i_s_pr.c +++ b/crypto/asn1/d2i_s_pr.c @@ -60,10 +60,10 @@ #include <stdio.h> #include "cryptlib.h" -#include "bn.h" -#include "dsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include <openssl/bn.h> +#include <openssl/dsa.h> +#include <openssl/objects.h> +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_DSAPRIVATEKEY,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/d2i_s_pu.c b/crypto/asn1/d2i_s_pu.c index c7b7ad0a43..562acd6922 100644 --- a/crypto/asn1/d2i_s_pu.c +++ b/crypto/asn1/d2i_s_pu.c @@ -60,10 +60,10 @@ #include <stdio.h> #include "cryptlib.h" -#include "bn.h" -#include "dsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include <openssl/bn.h> +#include <openssl/dsa.h> +#include <openssl/objects.h> +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_DSAPUBLICKEY,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/evp_asn1.c b/crypto/asn1/evp_asn1.c index 8197fcd8f7..7528b2d97f 100644 --- a/crypto/asn1/evp_asn1.c +++ b/crypto/asn1/evp_asn1.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1.h" -#include "asn1_mac.h" +#include <openssl/asn1.h> +#include <openssl/asn1_mac.h> int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len) { diff --git a/crypto/asn1/f.c b/crypto/asn1/f.c index 2ab3a262ac..82bccdfd51 100644 --- a/crypto/asn1/f.c +++ b/crypto/asn1/f.c @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ #include <stdio.h> -#include "asn1.h" -#include "err.h" +#include <openssl/asn1.h> +#include <openssl/err.h> main() { diff --git a/crypto/asn1/f_enum.c b/crypto/asn1/f_enum.c index 392e6b0184..ea460eb1df 100644 --- a/crypto/asn1/f_enum.c +++ b/crypto/asn1/f_enum.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "buffer.h" -#include "x509.h" +#include <openssl/buffer.h> +#include <openssl/x509.h> /* Based on a_int.c: equivalent ENUMERATED functions */ diff --git a/crypto/asn1/f_int.c b/crypto/asn1/f_int.c index 85ec6cec66..4d6c9b2278 100644 --- a/crypto/asn1/f_int.c +++ b/crypto/asn1/f_int.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "buffer.h" -#include "x509.h" +#include <openssl/buffer.h> +#include <openssl/x509.h> int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a) { diff --git a/crypto/asn1/f_string.c b/crypto/asn1/f_string.c index ab7a7b1f6b..9bcc5a93c9 100644 --- a/crypto/asn1/f_string.c +++ b/crypto/asn1/f_string.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "buffer.h" -#include "x509.h" +#include <openssl/buffer.h> +#include <openssl/x509.h> int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type) { diff --git a/crypto/asn1/i2d_dhp.c b/crypto/asn1/i2d_dhp.c index 690ba1ab8f..c3763eb6a5 100644 --- a/crypto/asn1/i2d_dhp.c +++ b/crypto/asn1/i2d_dhp.c @@ -58,9 +58,9 @@ #include <stdio.h> #include "cryptlib.h" -#include "bn.h" -#include "asn1_mac.h" -#include "dh.h" +#include <openssl/bn.h> +#include <openssl/asn1_mac.h> +#include <openssl/dh.h> /* * ASN1err(ASN1_F_D2I_DHPARAMS,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/i2d_dsap.c b/crypto/asn1/i2d_dsap.c index 402ed199dc..a7d03fe6d6 100644 --- a/crypto/asn1/i2d_dsap.c +++ b/crypto/asn1/i2d_dsap.c @@ -58,9 +58,9 @@ #include <stdio.h> #include "cryptlib.h" -#include "bn.h" -#include "asn1_mac.h" -#include "dsa.h" +#include <openssl/bn.h> +#include <openssl/asn1_mac.h> +#include <openssl/dsa.h> /* * ASN1err(ASN1_F_D2I_DSAPARAMS,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/i2d_pr.c b/crypto/asn1/i2d_pr.c index f173c9a5c1..71d6910204 100644 --- a/crypto/asn1/i2d_pr.c +++ b/crypto/asn1/i2d_pr.c @@ -58,9 +58,9 @@ #include <stdio.h> #include "cryptlib.h" -#include "bn.h" -#include "evp.h" -#include "objects.h" +#include <openssl/bn.h> +#include <openssl/evp.h> +#include <openssl/objects.h> int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp) { diff --git a/crypto/asn1/i2d_pu.c b/crypto/asn1/i2d_pu.c index 8139175e18..8f73d37d03 100644 --- a/crypto/asn1/i2d_pu.c +++ b/crypto/asn1/i2d_pu.c @@ -58,9 +58,9 @@ #include <stdio.h> #include "cryptlib.h" -#include "bn.h" -#include "evp.h" -#include "objects.h" +#include <openssl/bn.h> +#include <openssl/evp.h> +#include <openssl/objects.h> int i2d_PublicKey(EVP_PKEY *a, unsigned char **pp) { diff --git a/crypto/asn1/i2d_r_pr.c b/crypto/asn1/i2d_r_pr.c index cfd1fc74f5..cc61637de4 100644 --- a/crypto/asn1/i2d_r_pr.c +++ b/crypto/asn1/i2d_r_pr.c @@ -58,10 +58,10 @@ #include <stdio.h> #include "cryptlib.h" -#include "bn.h" -#include "rsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include <openssl/bn.h> +#include <openssl/rsa.h> +#include <openssl/objects.h> +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_RSAPRIVATEKEY,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/i2d_r_pu.c b/crypto/asn1/i2d_r_pu.c index 4f0a022317..eabc0ba892 100644 --- a/crypto/asn1/i2d_r_pu.c +++ b/crypto/asn1/i2d_r_pu.c @@ -58,10 +58,10 @@ #include <stdio.h> #include "cryptlib.h" -#include "bn.h" -#include "rsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include <openssl/bn.h> +#include <openssl/rsa.h> +#include <openssl/objects.h> +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_RSAPUBLICKEY,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/i2d_s_pr.c b/crypto/asn1/i2d_s_pr.c index 7374f7e9b5..afd8f5af03 100644 --- a/crypto/asn1/i2d_s_pr.c +++ b/crypto/asn1/i2d_s_pr.c @@ -58,10 +58,10 @@ #include <stdio.h> #include "cryptlib.h" -#include "bn.h" -#include "dsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include <openssl/bn.h> +#include <openssl/dsa.h> +#include <openssl/objects.h> +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_I2D_DSAPRIVATEKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); diff --git a/crypto/asn1/i2d_s_pu.c b/crypto/asn1/i2d_s_pu.c index bfa40f3e62..5c2757255d 100644 --- a/crypto/asn1/i2d_s_pu.c +++ b/crypto/asn1/i2d_s_pu.c @@ -58,10 +58,10 @@ #include <stdio.h> #include "cryptlib.h" -#include "bn.h" -#include "dsa.h" -#include "objects.h" -#include "asn1_mac.h" +#include <openssl/bn.h> +#include <openssl/dsa.h> +#include <openssl/objects.h> +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_I2D_DSAPUBLICKEY,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE); diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c index edab9feeab..f03ecca2ee 100644 --- a/crypto/asn1/n_pkey.c +++ b/crypto/asn1/n_pkey.c @@ -58,11 +58,11 @@ #include <stdio.h> #include "cryptlib.h" -#include "rsa.h" -#include "objects.h" -#include "asn1_mac.h" -#include "evp.h" -#include "x509.h" +#include <openssl/rsa.h> +#include <openssl/objects.h> +#include <openssl/asn1_mac.h> +#include <openssl/evp.h> +#include <openssl/x509.h> #ifndef NO_RC4 diff --git a/crypto/asn1/nsseq.c b/crypto/asn1/nsseq.c index ba43be59b2..34b16c4c46 100644 --- a/crypto/asn1/nsseq.c +++ b/crypto/asn1/nsseq.c @@ -58,10 +58,10 @@ #include <stdio.h> #include <stdlib.h> -#include "asn1_mac.h" -#include "err.h" -#include "x509.h" -#include "objects.h" +#include <openssl/asn1_mac.h> +#include <openssl/err.h> +#include <openssl/x509.h> +#include <openssl/objects.h> /* Netscape certificate sequence structure */ diff --git a/crypto/asn1/p5_pbe.c b/crypto/asn1/p5_pbe.c index b0de0d843b..950d5650c1 100644 --- a/crypto/asn1/p5_pbe.c +++ b/crypto/asn1/p5_pbe.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "rand.h" +#include <openssl/asn1_mac.h> +#include <openssl/rand.h> /* PKCS#5 password based encryption structure */ diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c index 2e496022de..327be53a74 100644 --- a/crypto/asn1/p5_pbev2.c +++ b/crypto/asn1/p5_pbev2.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "rand.h" +#include <openssl/asn1_mac.h> +#include <openssl/rand.h> /* PKCS#5 v2.0 password based encryption structures */ diff --git a/crypto/asn1/p7_dgst.c b/crypto/asn1/p7_dgst.c index 516746b104..bdec3e5146 100644 --- a/crypto/asn1/p7_dgst.c +++ b/crypto/asn1/p7_dgst.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "x509.h" +#include <openssl/asn1_mac.h> +#include <openssl/x509.h> /* * ASN1err(ASN1_F_PKCS7_DIGEST_NEW,ERR_R_MISSING_ASN1_EOS); diff --git a/crypto/asn1/p7_enc.c b/crypto/asn1/p7_enc.c index f5ebbf776d..40357c4550 100644 --- a/crypto/asn1/p7_enc.c +++ b/crypto/asn1/p7_enc.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "x509.h" +#include <openssl/asn1_mac.h> +#include <openssl/x509.h> /* * ASN1err(ASN1_F_PKCS7_ENCRYPT_NEW,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/p7_enc_c.c b/crypto/asn1/p7_enc_c.c index 8914d87402..ce8f9c1559 100644 --- a/crypto/asn1/p7_enc_c.c +++ b/crypto/asn1/p7_enc_c.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "x509.h" +#include <openssl/asn1_mac.h> +#include <openssl/x509.h> /* * ASN1err(ASN1_F_PKCS7_ENC_CONTENT_NEW,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/p7_evp.c b/crypto/asn1/p7_evp.c index babb9b2752..4989b93638 100644 --- a/crypto/asn1/p7_evp.c +++ b/crypto/asn1/p7_evp.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "x509.h" +#include <openssl/asn1_mac.h> +#include <openssl/x509.h> /* * ASN1err(ASN1_F_PKCS7_ENVELOPE_NEW,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/p7_i_s.c b/crypto/asn1/p7_i_s.c index 11ebfcadc9..f0ba5bc98c 100644 --- a/crypto/asn1/p7_i_s.c +++ b/crypto/asn1/p7_i_s.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "x509.h" +#include <openssl/asn1_mac.h> +#include <openssl/x509.h> /* * ASN1err(ASN1_F_PKCS7_ISSUER_AND_SERIAL_NEW,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/p7_lib.c b/crypto/asn1/p7_lib.c index 560f63ddba..52cfb93c72 100644 --- a/crypto/asn1/p7_lib.c +++ b/crypto/asn1/p7_lib.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "objects.h" +#include <openssl/asn1_mac.h> +#include <openssl/objects.h> /* ASN1err(ASN1_F_D2I_PKCS7,ASN1_R_BAD_PKCS7_CONTENT); * ASN1err(ASN1_F_I2D_PKCS7,ASN1_R_BAD_PKCS7_TYPE); diff --git a/crypto/asn1/p7_recip.c b/crypto/asn1/p7_recip.c index f6d121731a..d6e2876c85 100644 --- a/crypto/asn1/p7_recip.c +++ b/crypto/asn1/p7_recip.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "x509.h" +#include <openssl/asn1_mac.h> +#include <openssl/x509.h> /* * ASN1err(ASN1_F_PKCS7_RECIP_INFO_NEW,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/p7_s_e.c b/crypto/asn1/p7_s_e.c index c4d0eef4d7..54098d2341 100644 --- a/crypto/asn1/p7_s_e.c +++ b/crypto/asn1/p7_s_e.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "x509.h" +#include <openssl/asn1_mac.h> +#include <openssl/x509.h> /* * ASN1err(ASN1_F_PKCS7_SIGN_ENVELOPE_NEW,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/p7_signd.c b/crypto/asn1/p7_signd.c index c7e78cd3a3..90d3dcdd79 100644 --- a/crypto/asn1/p7_signd.c +++ b/crypto/asn1/p7_signd.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "x509.h" +#include <openssl/asn1_mac.h> +#include <openssl/x509.h> /* * ASN1err(ASN1_F_PKCS7_SIGNED_NEW,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/p7_signi.c b/crypto/asn1/p7_signi.c index 3ca11d9fc0..5a240bc593 100644 --- a/crypto/asn1/p7_signi.c +++ b/crypto/asn1/p7_signi.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "x509.h" +#include <openssl/asn1_mac.h> +#include <openssl/x509.h> /* * ASN1err(ASN1_F_PKCS7_SIGNER_INFO_NEW,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/p8_pkey.c b/crypto/asn1/p8_pkey.c index 455ee884b0..4a215abf8a 100644 --- a/crypto/asn1/p8_pkey.c +++ b/crypto/asn1/p8_pkey.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" +#include <openssl/asn1_mac.h> /* *ASN1err(ASN1_F_PKCS8_PRIV_KEY_INFO_NEW,ASN1_R_DECODE_ERROR) diff --git a/crypto/asn1/pkcs8.c b/crypto/asn1/pkcs8.c index c9e94a276e..d71f8c2d88 100644 --- a/crypto/asn1/pkcs8.c +++ b/crypto/asn1/pkcs8.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "objects.h" +#include <openssl/asn1_mac.h> +#include <openssl/objects.h> /* * ASN1err(ASN1_F_D2I_X509_KEY,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/t_crl.c b/crypto/asn1/t_crl.c index e919893265..bdfa03aa1a 100644 --- a/crypto/asn1/t_crl.c +++ b/crypto/asn1/t_crl.c @@ -58,11 +58,11 @@ #include <stdio.h> #include "cryptlib.h" -#include "buffer.h" -#include "bn.h" -#include "objects.h" -#include "x509.h" -#include "x509v3.h" +#include <openssl/buffer.h> +#include <openssl/bn.h> +#include <openssl/objects.h> +#include <openssl/x509.h> +#include <openssl/x509v3.h> #ifndef NOPROTO static void ext_print(BIO *out, X509_EXTENSION *ex); diff --git a/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c index fde4a37902..7bf470e8dd 100644 --- a/crypto/asn1/t_pkey.c +++ b/crypto/asn1/t_pkey.c @@ -58,16 +58,16 @@ #include <stdio.h> #include "cryptlib.h" -#include "buffer.h" -#include "bn.h" +#include <openssl/buffer.h> +#include <openssl/bn.h> #ifndef NO_RSA -#include "rsa.h" +#include <openssl/rsa.h> #endif #ifndef NO_DH -#include "dh.h" +#include <openssl/dh.h> #endif #ifndef NO_DSA -#include "dsa.h" +#include <openssl/dsa.h> #endif /* DHerr(DH_F_DHPARAMS_PRINT,ERR_R_MALLOC_FAILURE); diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c index 1079fe643d..6e04b0861c 100644 --- a/crypto/asn1/t_req.c +++ b/crypto/asn1/t_req.c @@ -58,10 +58,10 @@ #include <stdio.h> #include "cryptlib.h" -#include "buffer.h" -#include "bn.h" -#include "objects.h" -#include "x509.h" +#include <openssl/buffer.h> +#include <openssl/bn.h> +#include <openssl/objects.h> +#include <openssl/x509.h> #ifndef NO_FP_API int X509_REQ_print_fp(FILE *fp, X509_REQ *x) diff --git a/crypto/asn1/t_x509.c b/crypto/asn1/t_x509.c index e804635be2..517290b961 100644 --- a/crypto/asn1/t_x509.c +++ b/crypto/asn1/t_x509.c @@ -58,17 +58,17 @@ #include <stdio.h> #include "cryptlib.h" -#include "buffer.h" -#include "bn.h" +#include <openssl/buffer.h> +#include <openssl/bn.h> #ifndef NO_RSA -#include "rsa.h" +#include <openssl/rsa.h> #endif #ifndef NO_DSA -#include "dsa.h" +#include <openssl/dsa.h> #endif -#include "objects.h" -#include "x509.h" -#include "x509v3.h" +#include <openssl/objects.h> +#include <openssl/x509.h> +#include <openssl/x509v3.h> #ifndef NO_FP_API int X509_print_fp(FILE *fp, X509 *x) diff --git a/crypto/asn1/x_algor.c b/crypto/asn1/x_algor.c index 70b3779947..2d94b047fe 100644 --- a/crypto/asn1/x_algor.c +++ b/crypto/asn1/x_algor.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_X509_ALGOR,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/x_attrib.c b/crypto/asn1/x_attrib.c index ab8777a79f..6b33f58f57 100644 --- a/crypto/asn1/x_attrib.c +++ b/crypto/asn1/x_attrib.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "objects.h" -#include "asn1_mac.h" +#include <openssl/objects.h> +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_X509_ATTRIBUTE,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/x_cinf.c b/crypto/asn1/x_cinf.c index 41939334be..5ef17a932c 100644 --- a/crypto/asn1/x_cinf.c +++ b/crypto/asn1/x_cinf.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_X509_CINF,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/x_crl.c b/crypto/asn1/x_crl.c index e8f8ebd76c..82a2737a8d 100644 --- a/crypto/asn1/x_crl.c +++ b/crypto/asn1/x_crl.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "x509.h" +#include <openssl/asn1_mac.h> +#include <openssl/x509.h> /* * ASN1err(ASN1_F_D2I_X509_CRL,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/x_exten.c b/crypto/asn1/x_exten.c index 15c46e3526..f6124bbb8e 100644 --- a/crypto/asn1/x_exten.c +++ b/crypto/asn1/x_exten.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "objects.h" -#include "asn1_mac.h" +#include <openssl/objects.h> +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_X509_EXTENSION,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/x_info.c b/crypto/asn1/x_info.c index 03bc38cdf7..0ee9eb7955 100644 --- a/crypto/asn1/x_info.c +++ b/crypto/asn1/x_info.c @@ -58,9 +58,9 @@ #include <stdio.h> #include "cryptlib.h" -#include "evp.h" -#include "asn1_mac.h" -#include "x509.h" +#include <openssl/evp.h> +#include <openssl/asn1_mac.h> +#include <openssl/x509.h> X509_INFO *X509_INFO_new(void) { diff --git a/crypto/asn1/x_name.c b/crypto/asn1/x_name.c index 939b1699d6..15d9aa4ea0 100644 --- a/crypto/asn1/x_name.c +++ b/crypto/asn1/x_name.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "objects.h" -#include "asn1_mac.h" +#include <openssl/objects.h> +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_X509_NAME,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/x_pkey.c b/crypto/asn1/x_pkey.c index 2e677f0b24..fc145a8ce8 100644 --- a/crypto/asn1/x_pkey.c +++ b/crypto/asn1/x_pkey.c @@ -58,9 +58,9 @@ #include <stdio.h> #include "cryptlib.h" -#include "evp.h" -#include "objects.h" -#include "asn1_mac.h" +#include <openssl/evp.h> +#include <openssl/objects.h> +#include <openssl/asn1_mac.h> /* ASN1err(ASN1_F_D2I_X509_PKEY,ASN1_R_UNSUPPORTED_CIPHER); */ /* ASN1err(ASN1_F_X509_PKEY_NEW,ASN1_R_IV_TOO_LARGE); */ diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c index 9711f98da1..90b6c908a2 100644 --- a/crypto/asn1/x_pubkey.c +++ b/crypto/asn1/x_pubkey.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_X509_PUBKEY,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/x_req.c b/crypto/asn1/x_req.c index 4bb604e5a4..f6b1a95b7a 100644 --- a/crypto/asn1/x_req.c +++ b/crypto/asn1/x_req.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" -#include "x509.h" +#include <openssl/asn1_mac.h> +#include <openssl/x509.h> /* * ASN1err(ASN1_F_D2I_X509_REQ,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/x_sig.c b/crypto/asn1/x_sig.c index b0675b74c3..f9c2a57c00 100644 --- a/crypto/asn1/x_sig.c +++ b/crypto/asn1/x_sig.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_X509_SIG,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/x_spki.c b/crypto/asn1/x_spki.c index 8cb1aaee33..22991245a8 100644 --- a/crypto/asn1/x_spki.c +++ b/crypto/asn1/x_spki.c @@ -62,8 +62,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "x509.h" -#include "asn1_mac.h" +#include <openssl/x509.h> +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_NETSCAPE_SPKAC,ERR_R_ASN1_LENGTH_MISMATCH); diff --git a/crypto/asn1/x_val.c b/crypto/asn1/x_val.c index 9ffa8671d5..b82f913b5c 100644 --- a/crypto/asn1/x_val.c +++ b/crypto/asn1/x_val.c @@ -58,7 +58,7 @@ #include <stdio.h> #include "cryptlib.h" -#include "asn1_mac.h" +#include <openssl/asn1_mac.h> /* ASN1err(ASN1_F_X509_VAL_NEW,ERR_R_MALLOC_FAILURE); * ASN1err(ASN1_F_X509_VAL_FREE,ERR_R_MALLOC_FAILURE); diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c index f1459a7989..d6938f7da0 100644 --- a/crypto/asn1/x_x509.c +++ b/crypto/asn1/x_x509.c @@ -58,8 +58,8 @@ #include <stdio.h> #include "cryptlib.h" -#include "evp.h" -#include "asn1_mac.h" +#include <openssl/evp.h> +#include <openssl/asn1_mac.h> /* * ASN1err(ASN1_F_D2I_X509,ERR_R_ASN1_LENGTH_MISMATCH); |