diff options
Diffstat (limited to 'crypto/pem')
| -rw-r--r-- | crypto/pem/Makefile.ssl | 6 | ||||
| -rw-r--r-- | crypto/pem/pem.h | 6 | ||||
| -rw-r--r-- | crypto/pem/pem_all.c | 10 | ||||
| -rw-r--r-- | crypto/pem/pem_err.c | 4 | ||||
| -rw-r--r-- | crypto/pem/pem_info.c | 10 | ||||
| -rw-r--r-- | crypto/pem/pem_lib.c | 14 | ||||
| -rw-r--r-- | crypto/pem/pem_seal.c | 10 | ||||
| -rw-r--r-- | crypto/pem/pem_sign.c | 10 |
8 files changed, 35 insertions, 35 deletions
diff --git a/crypto/pem/Makefile.ssl b/crypto/pem/Makefile.ssl index 8f7b23c8a0..b6375b915d 100644 --- a/crypto/pem/Makefile.ssl +++ b/crypto/pem/Makefile.ssl @@ -48,15 +48,15 @@ files: links: $(EXHEADER) @$(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/pem/pem.h b/crypto/pem/pem.h index 2c279c60ba..42be3c0177 100644 --- a/crypto/pem/pem.h +++ b/crypto/pem/pem.h @@ -63,9 +63,9 @@ extern "C" { #endif -#include "evp.h" -#include "x509.h" -#include "pem2.h" +#include <openssl/evp.h> +#include <openssl/x509.h> +#include <openssl/pem2.h> #define PEM_OBJ_UNDEF 0 #define PEM_OBJ_X509 1 diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c index c2bf6eb909..740f6b5722 100644 --- a/crypto/pem/pem_all.c +++ b/crypto/pem/pem_all.c @@ -59,11 +59,11 @@ #include <stdio.h> #undef SSLEAY_MACROS #include "cryptlib.h" -#include "bio.h" -#include "evp.h" -#include "x509.h" -#include "pkcs7.h" -#include "pem.h" +#include <openssl/bio.h> +#include <openssl/evp.h> +#include <openssl/x509.h> +#include <openssl/pkcs7.h> +#include <openssl/pem.h> #ifndef NO_FP_API /* The X509 functions */ diff --git a/crypto/pem/pem_err.c b/crypto/pem/pem_err.c index bffc99f588..ec138f05e1 100644 --- a/crypto/pem/pem_err.c +++ b/crypto/pem/pem_err.c @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ #include <stdio.h> -#include "err.h" -#include "pem.h" +#include <openssl/err.h> +#include <openssl/pem.h> /* BEGIN ERROR CODES */ #ifndef NO_ERR diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c index 7051c099f1..83bdcf492f 100644 --- a/crypto/pem/pem_info.c +++ b/crypto/pem/pem_info.c @@ -58,11 +58,11 @@ #include <stdio.h> #include "cryptlib.h" -#include "buffer.h" -#include "objects.h" -#include "evp.h" -#include "x509.h" -#include "pem.h" +#include <openssl/buffer.h> +#include <openssl/objects.h> +#include <openssl/evp.h> +#include <openssl/x509.h> +#include <openssl/pem.h> #ifndef NO_FP_API STACK *PEM_X509_INFO_read(FILE *fp, STACK *sk, int (*cb)()) diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index 47189bdf9b..9e646023e6 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -58,14 +58,14 @@ #include <stdio.h> #include "cryptlib.h" -#include "buffer.h" -#include "objects.h" -#include "evp.h" -#include "rand.h" -#include "x509.h" -#include "pem.h" +#include <openssl/buffer.h> +#include <openssl/objects.h> +#include <openssl/evp.h> +#include <openssl/rand.h> +#include <openssl/x509.h> +#include <openssl/pem.h> #ifndef NO_DES -#include "des.h" +#include <openssl/des.h> #endif const char *PEM_version="PEM" OPENSSL_VERSION_PTEXT; diff --git a/crypto/pem/pem_seal.c b/crypto/pem/pem_seal.c index fd493e5251..5f5d2c0e43 100644 --- a/crypto/pem/pem_seal.c +++ b/crypto/pem/pem_seal.c @@ -58,11 +58,11 @@ #include <stdio.h> #include "cryptlib.h" -#include "evp.h" -#include "rand.h" -#include "objects.h" -#include "x509.h" -#include "pem.h" +#include <openssl/evp.h> +#include <openssl/rand.h> +#include <openssl/objects.h> +#include <openssl/x509.h> +#include <openssl/pem.h> int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, EVP_MD *md_type, unsigned char **ek, int *ekl, unsigned char *iv, EVP_PKEY **pubk, diff --git a/crypto/pem/pem_sign.c b/crypto/pem/pem_sign.c index e370758574..aabafb702d 100644 --- a/crypto/pem/pem_sign.c +++ b/crypto/pem/pem_sign.c @@ -58,11 +58,11 @@ #include <stdio.h> #include "cryptlib.h" -#include "rand.h" -#include "evp.h" -#include "objects.h" -#include "x509.h" -#include "pem.h" +#include <openssl/rand.h> +#include <openssl/evp.h> +#include <openssl/objects.h> +#include <openssl/x509.h> +#include <openssl/pem.h> void PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type) { |