Change #include filenames from <foo.h> to <openssl.h>.

Submitted by:
Reviewed by:
PR:

diff --git a/Configure b/Configure
index abf0562c8a500ff42e5822e206b5809a4186bbcb..3085fa0f1aba76797763bfa626b2f44bd6ced2d6 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -542,6 +542,31 @@ if($IsWindows) {
 
 system 'make -f Makefile.ssl links' if !$IsWindows;
 
+my $pwd=`pwd`;
+chop($pwd);
+print <<EOF;
+
+NOTE: The OpenSSL header files have been moved from include/*.h
+to include/openssl/*.h.  To include OpenSSL header files, now
+directives of the form
+     #include <openssl/foo.h>
+should be used instead of #include <foo.h>.
+These new file locations allow installing the OpenSSL header
+files in /usr/local/include/openssl/ and should help avoid
+conflicts with other libraries.
+
+To compile programs that use the old form <foo.h>,
+usually an additional compiler option will suffice: E.g., add
+     -I/usr/local/include/openssl
+or
+     -I$pwd/include/openssl
+to the CFLAGS in the Makefile of the program that you want to compile.
+
+Please make sure that no old OpenSSL header files are around:
+The include directory should now be empty except for the openssl
+subdirectory.
+EOF
+
 exit(0);
 
 sub bad_target

diff --git a/Makefile.org b/Makefile.org
index 074899f3069b7333ea86ce9ee214a85e76386c71..23be9bc14bab65644efa2c51c2df281831fa931e 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -215,7 +215,8 @@ files:
 
 links:
        @$(TOP)/util/point.sh Makefile.ssl Makefile
-       @$(TOP)/util/mklink.sh include $(EXHEADER)
+       @-mkdir -p include/openssl 2>/dev/null
+       @$(TOP)/util/mklink.sh include/openssl $(EXHEADER)
        @for i in $(DIRS); do \
        (cd $$i && echo "making links in $$i..." && \
        $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' links ) || exit 1; \
@@ -290,6 +291,7 @@ install: all
        @-mkdir -p $(INSTALLTOP)/bin 2>/dev/null
        @-mkdir -p $(INSTALLTOP)/lib 2>/dev/null
        @-mkdir -p $(INSTALLTOP)/include 2>/dev/null
+       @-mkdir -p $(INSTALLTOP)/include/openssl 2>/dev/null
        @-mkdir -p $(INSTALLTOP)/certs 2>/dev/null
        @-mkdir -p $(INSTALLTOP)/private 2>/dev/null
        @for i in $(DIRS) ;\

diff --git a/apps/apps.h b/apps/apps.h
index 25a9262e037850aa353e4152592804993a47c39c..3ad21bb9a9a5e3c565a105b730275969b985164a 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -59,11 +59,11 @@
 #ifndef HEADER_APPS_H
 #define HEADER_APPS_H
 
-#include "e_os.h"
+#include <openssl/e_os.h>
 
-#include "buffer.h"
-#include "bio.h"
-#include "crypto.h"
+#include <openssl/buffer.h>
+#include <openssl/bio.h>
+#include <openssl/crypto.h>
 #include "progs.h"
 
 #ifdef NO_STDIO
@@ -88,7 +88,7 @@ extern BIO *bio_err;
 #else
 
 #define MAIN(a,v)      PROG(a,v)
-#include "conf.h"
+#include <openssl/conf.h>
 extern LHASH *config;
 extern char *default_config_file;
 extern BIO *bio_err;

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 39e97887af3d6376c5cb32fe8a7044a93636df72..a5e4bfcf5e8a54e26f664bd921304853f792223d 100644 (file)
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -64,10 +64,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
-#include "err.h"
-#include "evp.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 /* -inform arg - input format - default PEM (DER or PEM)
  * -in arg     - input file - default stdin

diff --git a/apps/ca.c b/apps/ca.c
index 5ce0dc202b9df8bb1b91860d4d94cd160b88932d..16afb8d7ee7e1733d0bdf1d5adf5ac443e8ac83f 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -64,16 +64,16 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
-#include "conf.h"
-#include "bio.h"
-#include "err.h"
-#include "bn.h"
-#include "txt_db.h"
-#include "evp.h"
-#include "x509.h"
-#include "x509v3.h"
-#include "objects.h"
-#include "pem.h"
+#include <openssl/conf.h>
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/txt_db.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/objects.h>
+#include <openssl/pem.h>
 
 #ifndef W_OK
 #include <sys/file.h>

diff --git a/apps/ciphers.c b/apps/ciphers.c
index b02b64b5dfb15ab8992f434ff9bd241fd7cfa4a8..3c76782b7e3ad773084309f3c6c3013e36b96be1 100644 (file)
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -63,8 +63,8 @@
 #define APPS_WIN16
 #endif
 #include "apps.h"
-#include "err.h"
-#include "ssl.h"
+#include <openssl/err.h>
+#include <openssl/ssl.h>
 
 #undef PROG
 #define PROG   ciphers_main

diff --git a/apps/crl.c b/apps/crl.c
index 0c03f5fb6c77157f59bfea56ad7ac317bf34a027..cdbee4847d43a98b50b7074ef81fc79419202cee 100644 (file)
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -60,11 +60,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "x509.h"
-#include "x509v3.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG   crl_main

diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index aa407b709892f3a8e9bb8d02b712177778ed4a6e..12e535a282bcb47dd5e1ac4d9a9bccf9a8d21065 100644 (file)
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -65,12 +65,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
-#include "err.h"
-#include "evp.h"
-#include "x509.h"
-#include "pkcs7.h"
-#include "pem.h"
-#include "objects.h"
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pem.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);

diff --git a/apps/dgst.c b/apps/dgst.c
index 2926e5514f9b767a1a5b70557529481f8f24778c..82bb20a8be33516f8e1d48bd988ec6871ba07ec7 100644 (file)
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -60,12 +60,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #undef BUFSIZE
 #define BUFSIZE        1024*8

diff --git a/apps/dh.c b/apps/dh.c
index 0b548ef5703bde50971f20060e5ec1bf176880ea..02742485ce234609ec002063d855201b70e97e15 100644 (file)
--- a/apps/dh.c
+++ b/apps/dh.c
@@ -61,12 +61,12 @@
 #include <time.h>
 #include <string.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "bn.h"
-#include "dh.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/dh.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG   dh_main

diff --git a/apps/dsa.c b/apps/dsa.c
index 312ed31798aad8ebc14471fbd21f3dff42cc2986..dc282b77d0ff722667afede4bb9922239d4aab90 100644 (file)
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -61,12 +61,12 @@
 #include <string.h>
 #include <time.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "dsa.h"
-#include "evp.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/dsa.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG   dsa_main

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 085e4845c1040b5bc1b02ec2c51010f4ff412389..e733b53db4924b7595712f8394a66a3e6d55e45e 100644 (file)
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -61,13 +61,13 @@
 #include <time.h>
 #include <string.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "bn.h"
-#include "rand.h"
-#include "dsa.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/rand.h>
+#include <openssl/dsa.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG   dsaparam_main

diff --git a/apps/eay.c b/apps/eay.c
index 7c3bae3bfb1342354a86588902bc2123e793fc34..80a141b938043df789afbfb979d9ba806f1e6d67 100644 (file)
--- a/apps/eay.c
+++ b/apps/eay.c
@@ -64,27 +64,27 @@
 #define USE_SOCKETS
 #include "../e_os.h"
 
-#include "bio.h"
-#include "stack.h"
-#include "lhash.h"
+#include <openssl/bio.h>
+#include <openssl/stack.h>
+#include <openssl/lhash.h>
 
-#include "err.h"
+#include <openssl/err.h>
 
-#include "bn.h"
+#include <openssl/bn.h>
 
-#include "evp.h"
+#include <openssl/evp.h>
 
-#include "rand.h"
-#include "conf.h"
-#include "txt_db.h"
+#include <openssl/rand.h>
+#include <openssl/conf.h>
+#include <openssl/txt_db.h>
 
-#include "err.h"
+#include <openssl/err.h>
 
-#include "x509.h"
-#include "pkcs7.h"
-#include "pem.h"
-#include "asn1.h"
-#include "objects.h"
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pem.h>
+#include <openssl/asn1.h>
+#include <openssl/objects.h>
 
 #define MONOLITH
 

diff --git a/apps/enc.c b/apps/enc.c
index b5613267334fe5aa5e6267186037bd895db52bff..84a81ffb2306e49df0f3135a8f726bae5c98e045 100644 (file)
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -60,15 +60,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
 #ifdef NO_MD5
-#include "md5.h"
+#include <openssl/md5.h>
 #endif
-#include "pem.h"
+#include <openssl/pem.h>
 
 #ifndef NOPROTO
 int set_hex(char *in,unsigned char *out,int size);

diff --git a/apps/errstr.c b/apps/errstr.c
index ee51abaf345882c66edba2a4d9d9662b01b137d6..c86b5d940bcac9e87482f1c5e7215c3b12028847 100644 (file)
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -60,10 +60,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
-#include "bio.h"
-#include "lhash.h"
-#include "err.h"
-#include "ssl.h"
+#include <openssl/bio.h>
+#include <openssl/lhash.h>
+#include <openssl/err.h>
+#include <openssl/ssl.h>
 
 #undef PROG
 #define PROG   errstr_main

diff --git a/apps/gendh.c b/apps/gendh.c
index 8900b4f1af349c3bd66ac2bae31c2595a3352f75..c69147e3704472842123263cd2f3c922d2aac28b 100644 (file)
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -61,13 +61,13 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
-#include "bio.h"
-#include "rand.h"
-#include "err.h"
-#include "bn.h"
-#include "dh.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/dh.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #define DEFBITS        512
 #undef PROG

diff --git a/apps/gendsa.c b/apps/gendsa.c
index 3e198a24f96055ff58a4cab046f3b811a053b48c..db641da5036ababc0c48e2a5ce1d4bac5f9ba77c 100644 (file)
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -61,13 +61,13 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
-#include "bio.h"
-#include "rand.h"
-#include "err.h"
-#include "bn.h"
-#include "dsa.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #define DEFBITS        512
 #undef PROG

diff --git a/apps/genrsa.c b/apps/genrsa.c
index f83bafc7f1ab54682cd5ef0c23fa743babf6690d..30f1618f18f0d1bb20342b77cd3f65b2452784ab 100644 (file)
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -61,14 +61,14 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
-#include "bio.h"
-#include "rand.h"
-#include "err.h"
-#include "bn.h"
-#include "rsa.h"
-#include "evp.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #define DEFBITS        512
 #undef PROG

diff --git a/apps/nseq.c b/apps/nseq.c
index a36f29f5187eafd7bc2a592b904c828da6eff328..9c84d93b81fc956462d685be885f6b7b04724248 100644 (file)
--- a/apps/nseq.c
+++ b/apps/nseq.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "pem.h"
-#include "err.h"
+#include <openssl/pem.h>
+#include <openssl/err.h>
 #include "apps.h"
 
 #undef PROG

diff --git a/apps/openssl.c b/apps/openssl.c
index 21724201d6f19ca94d62a67276efcd004d81e12a..bae0c4f0046078d09818771111054d4f3c94e29b 100644 (file)
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -63,19 +63,19 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "bio.h"
-#include "crypto.h"
-#include "lhash.h"
-#include "conf.h"
-#include "x509.h"
-#include "pem.h"
-#include "ssl.h"
+#include <openssl/bio.h>
+#include <openssl/crypto.h>
+#include <openssl/lhash.h>
+#include <openssl/conf.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
 #define SSLEAY /* turn off a few special case MONOLITH macros */
 #define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
 #define SSLEAY_SRC
 #include "apps.h"
 #include "s_apps.h"
-#include "err.h"
+#include <openssl/err.h>
 
 /*
 #ifdef WINDOWS

diff --git a/apps/pem_mail.c b/apps/pem_mail.c
index acbf7bd9a02e0a110c2864a4be7e25fbe552eedf..b60c9a39223eba49e348f4572b326968e278e859 100644 (file)
--- a/apps/pem_mail.c
+++ b/apps/pem_mail.c
@@ -57,12 +57,12 @@
  */
 
 #include <stdio.h>
-#include "rsa.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
-#include "err.h"
-#include "pem.h"
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+#include <openssl/err.h>
+#include <openssl/pem.h>
 #include "apps.h"
 
 #undef PROG

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 97b7c88ef952ed86222570b525dbc916996431d3..79fd19a69f893aac56199f2aaaa8862f03199f75 100644 (file)
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -59,9 +59,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pem.h>
-#include <err.h>
-#include "pkcs12.h"
+#include <openssl/pem.h>
+#include <openssl/err.h>
+#include <openssl/pkcs12.h>
 
 #include "apps.h"
 #define PROG pkcs12_main

diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index ece2cd7d68d1cb8e1c235c9fa2b7d5d353f888cc..24b3e57882c516d28fe1debe157a01d6039e60af 100644 (file)
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -61,12 +61,12 @@
 #include <string.h>
 #include <time.h>
 #include "apps.h"
-#include "err.h"
-#include "objects.h"
-#include "evp.h"
-#include "x509.h"
-#include "pkcs7.h"
-#include "pem.h"
+#include <openssl/err.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG   pkcs7_main

diff --git a/apps/req.c b/apps/req.c
index 69f371697bb18033e2aa774bd3bfe7bb9df3373c..78a50a55252490205d3351b9a0ce5f432467841d 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -64,16 +64,16 @@
 #define APPS_WIN16
 #endif
 #include "apps.h"
-#include "bio.h"
-#include "evp.h"
-#include "rand.h"
-#include "conf.h"
-#include "err.h"
-#include "asn1.h"
-#include "x509.h"
-#include "x509v3.h"
-#include "objects.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/rand.h>
+#include <openssl/conf.h>
+#include <openssl/err.h>
+#include <openssl/asn1.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/objects.h>
+#include <openssl/pem.h>
 
 #define SECTION                "req"
 

diff --git a/apps/rsa.c b/apps/rsa.c
index e09eeda16e6e83a8e1290b701abfa4eca522176d..1372a5fac9e0c9efb9dde4253862514a08b0f067 100644 (file)
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -61,12 +61,12 @@
 #include <string.h>
 #include <time.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "rsa.h"
-#include "evp.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG   rsa_main

diff --git a/apps/s_cb.c b/apps/s_cb.c
index ad5bc26e318325f22cd41faa43e91f887839c16a..fdb11a1d11d71ccbce1342b313af035347051ad4 100644 (file)
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -63,9 +63,9 @@
 #include "apps.h"
 #undef NON_MAIN
 #undef USE_SOCKETS
-#include "err.h"
-#include "x509.h"
-#include "ssl.h"
+#include <openssl/err.h>
+#include <openssl/x509.h>
+#include <openssl/ssl.h>
 #include "s_apps.h"
 
 int verify_depth=0;

diff --git a/apps/s_client.c b/apps/s_client.c
index 20e581ec204edd4e667619eef64939318bc42daf..9e90b483f2a7e1227f54413db413418a08527e2a 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -64,10 +64,10 @@
 #define APPS_WIN16
 #endif
 #include "apps.h"
-#include "x509.h"
-#include "ssl.h"
-#include "err.h"
-#include "pem.h"
+#include <openssl/x509.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/pem.h>
 #include "s_apps.h"
 
 #undef PROG

diff --git a/apps/s_server.c b/apps/s_server.c
index f026fa1b6b673432ea99a8306fe2dd0036504fa8..0198cb8a0538812bad5db1efe681db2d9736e6b1 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -64,14 +64,14 @@
 #ifdef NO_STDIO
 #define APPS_WIN16
 #endif
-#include "lhash.h"
-#include "bn.h"
+#include <openssl/lhash.h>
+#include <openssl/bn.h>
 #define USE_SOCKETS
 #include "apps.h"
-#include "err.h"
-#include "pem.h"
-#include "x509.h"
-#include "ssl.h"
+#include <openssl/err.h>
+#include <openssl/pem.h>
+#include <openssl/x509.h>
+#include <openssl/ssl.h>
 #include "s_apps.h"
 
 #ifndef NOPROTO

diff --git a/apps/s_socket.c b/apps/s_socket.c
index 2c83dbb6072cfd5ff2dee1a60179666562a4e9c8..9110234ed2096f344243ee9fb32276f3d40d0f4c 100644 (file)
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -67,7 +67,7 @@
 #undef USE_SOCKETS
 #undef NON_MAIN
 #include "s_apps.h"
-#include "ssl.h"
+#include <openssl/ssl.h>
 
 #ifndef NOPROTO
 static struct hostent *GetHostByName(char *name);

diff --git a/apps/s_time.c b/apps/s_time.c
index 1e335ef4b260c226f01fecc49ed777a91f969fd5..187c09d12e9a33bff5a4b8f9d9a0149089ac4fb5 100644 (file)
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -70,13 +70,13 @@
 #ifdef NO_STDIO
 #define APPS_WIN16
 #endif
-#include "x509.h"
-#include "ssl.h"
-#include "pem.h"
+#include <openssl/x509.h>
+#include <openssl/ssl.h>
+#include <openssl/pem.h>
 #define USE_SOCKETS
 #include "apps.h"
 #include "s_apps.h"
-#include "err.h"
+#include <openssl/err.h>
 #ifdef WIN32_STUFF
 #include "winmain.h"
 #include "wintext.h"

diff --git a/apps/sc.c b/apps/sc.c
index 816040d28ae099870234360ca6c264704802039f..e6da658f06342eede973613ac138ac2a4cf0b52e 100644 (file)
--- a/apps/sc.c
+++ b/apps/sc.c
@@ -64,10 +64,10 @@
 #define APPS_WIN16
 #endif
 #include "apps.h"
-#include "x509.h"
-#include "ssl.h"
-#include "err.h"
-#include "pem.h"
+#include <openssl/x509.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/pem.h>
 #include "s_apps.h"
 
 #ifdef WINDOWS

diff --git a/apps/sess_id.c b/apps/sess_id.c
index c1b497981ee8f95408216183342b0cce103f860e..11cf837267c2eeab5448c9da86862ba02131b7ae 100644 (file)
--- a/apps/sess_id.c
+++ b/apps/sess_id.c
@@ -60,11 +60,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "x509.h"
-#include "pem.h"
-#include "ssl.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
 
 #undef PROG
 #define PROG   sess_id_main

diff --git a/apps/speed.c b/apps/speed.c
index 6c88a1c3d12a4927ae2b3616bbf50e0d6e361ab3..d6ee53e9fe5cb266d10344e12e4202522ee699a0 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -78,9 +78,9 @@
 #ifdef NO_STDIO
 #define APPS_WIN16
 #endif
-#include "crypto.h"
-#include "rand.h"
-#include "err.h"
+#include <openssl/crypto.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
 
 #ifndef MSDOS
 #define TIMES
@@ -114,47 +114,47 @@ struct tms {
 #endif
 
 #ifndef NO_DES
-#include "des.h"
+#include <openssl/des.h>
 #endif
 #ifndef NO_MD2
-#include "md2.h"
+#include <openssl/md2.h>
 #endif
 #ifndef NO_MDC2
-#include "mdc2.h"
+#include <openssl/mdc2.h>
 #endif
 #ifndef NO_MD5
-#include "md5.h"
-#include "hmac.h"
-#include "evp.h"
+#include <openssl/md5.h>
+#include <openssl/hmac.h>
+#include <openssl/evp.h>
 #endif
 #ifndef NO_SHA1
-#include "sha.h"
+#include <openssl/sha.h>
 #endif
 #ifndef NO_RMD160
-#include "ripemd.h"
+#include <openssl/ripemd.h>
 #endif
 #ifndef NO_RC4
-#include "rc4.h"
+#include <openssl/rc4.h>
 #endif
 #ifndef NO_RC5
-#include "rc5.h"
+#include <openssl/rc5.h>
 #endif
 #ifndef NO_RC2
-#include "rc2.h"
+#include <openssl/rc2.h>
 #endif
 #ifndef NO_IDEA
-#include "idea.h"
+#include <openssl/idea.h>
 #endif
 #ifndef NO_BLOWFISH
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 #endif
 #ifndef NO_CAST
-#include "cast.h"
+#include <openssl/cast.h>
 #endif
 #ifndef NO_RSA
-#include "rsa.h"
+#include <openssl/rsa.h>
 #endif
-#include "x509.h"
+#include <openssl/x509.h>
 #include "./testrsa.h"
 #ifndef NO_DSA
 #include "./testdsa.h"

diff --git a/apps/verify.c b/apps/verify.c
index 1a324c3da90f7f76c389767aa0d5bfba25b0aac2..aa6ee03a1d80b939f14e94a0abae58bdc3668c55 100644 (file)
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -60,10 +60,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG   verify_main

diff --git a/apps/version.c b/apps/version.c
index fd46e17688db91da0a956a5e6aeb1e5356c3941a..f249d15aa6cc6216c8fc27d73fd80932fdcc6719 100644 (file)
--- a/apps/version.c
+++ b/apps/version.c
@@ -60,8 +60,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
-#include "evp.h"
-#include "crypto.h"
+#include <openssl/evp.h>
+#include <openssl/crypto.h>
 
 #undef PROG
 #define PROG   version_main

diff --git a/apps/x509.c b/apps/x509.c
index f1975dca9d4aad801e2c9cae9036bc8d0670dc8f..f336f240777f60f38f59a90ab655d33f3e2b8109 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -63,15 +63,15 @@
 #define APPS_WIN16
 #endif
 #include "apps.h"
-#include "bio.h"
-#include "asn1.h"
-#include "err.h"
-#include "bn.h"
-#include "evp.h"
-#include "x509.h"
-#include "x509v3.h"
-#include "objects.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/asn1.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/objects.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG x509_main

diff --git a/bugs/stream.c b/bugs/stream.c
index 50a3884995c50730c9f436b673aa677f374f3ecb..d2967c837d8ef4508350a13e00600f1bf7efc27b 100644 (file)
--- a/bugs/stream.c
+++ b/bugs/stream.c
@@ -57,11 +57,11 @@
  */
 
 #include <stdio.h>
-#include "rc4.h"
+#include <openssl/rc4.h>
 #ifdef NO_DES
 #include <des.h>
 #else
-#include "des.h"
+#include <openssl/des.h>
 #endif
 
 /* show how stream ciphers are not very good.  The mac has no affect

diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index 9e4df74f9e42efe2e9cb0d3bcb41f0a16a7945a8..1cef8d80edf21a6b8f6a816817b05c51216bf8c3 100644 (file)
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -69,7 +69,7 @@ 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)
        @$(TOP)/util/point.sh Makefile.ssl Makefile
@@ -100,8 +100,8 @@ tests:
 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;
        @for i in $(SDIRS) ;\
        do \

diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl
index c6e1f2f8a43e3306176410213d92043915e6fa4d..df36d7312f46fa76463a7e78a7f4b5b41be2d4cb 100644 (file)
--- 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 cd4d835003cad6dcadc75a996f79a22faa3917e7..d1d28bd9bb9f6fc57634bcce33e1866434353234 100644 (file)
--- 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 2cb322ab43c843a11e56553ab7478bd2febe3eb2..e492ab9ec08225715c57707858d6cfbf2f9f6307 100644 (file)
--- 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 fc55a92f485f4a31c3116620b949223b05f2d04a..711c57e5c00f22c0333c247ce5fbd6b260eeef44 100644 (file)
--- 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 fdfe9ea8efda48f25d20e54714256d6e933926c2..153be366600a264c03978a729ffc8ebfe48a5786 100644 (file)
--- 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 465986eb63f4af84530e07397649c3987805d58f..a49d1cb2897746eca4e6f3bebf22af32826d89d7 100644 (file)
--- 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 20cde71f03b0ebdff565e75346def05e08c8cc9a..f3de4916658112a2b8f85b5b4a1773f41fbc0fc9 100644 (file)
--- 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 cf5748296cd1b4d331add4c8b1ca90d0f0152341..c0a8709f3b4526d10c3b305b7cd750d5a6b7fb0f 100644 (file)
--- 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 0f8ad843c0706a3cfa5a9707dbde9d96ed56a88f..7ad863a4bc87a5c4298090b1d3d792d62887a135 100644 (file)
--- 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 7992739cad7300b863d3f1e866f5cfc65291b712..3952eaf170f2b75fcb8e34ee7a4168a0e3ba13b5 100644 (file)
--- 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 d1bf08af4b8390373d5335ecf0d2183b2c6788e9..1d44b9d5a1810a33b35f354b627880e9d13c45a4 100644 (file)
--- 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 f010ec127210c788e1a1709fdff1965e81deefdc..6bd845443cc02bab3b12b40f154aedc2e73e8943 100644 (file)
--- 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 acfc855261bbf0a2a330ddaa06d912886cfd6112..dcae5cce353750c0ef1eb54c2df2dc21e44ffa61 100644 (file)
--- 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 961085578e9df29dc18fea5b23da4967e3a4db9f..32c8693955ba81579708d847e61f3945e5b0c317 100644 (file)
--- 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 ef77bb0d2d3ba2cc98dc515f18cd221ad9956802..9f9b2f04f25b0a240b9a03bf134551824221775d 100644 (file)
--- 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 250917518540e51dc32fcc40d4b118ed18820273..16cf8133afdbb8cc35bd6f23351f0fec3f993cf8 100644 (file)
--- 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 babb571c5ba72be1a450deda6774f294128c2fef..4e50f6ec8b98cd874eab802386e9fc3fc2936f97 100644 (file)
--- 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 406c68face2e477a5994161c7c9a0ceb94100d7c..17c0a5f84146f417b3d820bc804f7b962d6d6fc3 100644 (file)
--- 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 7ce246c7cf00a211f63e9dfd1db215f20cbf5cf0..57595692e5b965478259ae3d6aba328130423c0c 100644 (file)
--- 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 495f0814a3b169cd897c015dae1892a40e79b7a9..19bfdda7c432811f3cb14d83b963ff89b48e40f1 100644 (file)
--- 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 5ccd5de00e5a97379df50314b843042a6753b672..c9b5e7d0479112eaf6ace568f3f4c18ca2bc563c 100644 (file)
--- 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 291c0fda696c107da277b770bb60b4641568e2c0..5c5d8a1cabbe498a468f52c74279de2963327761 100644 (file)
--- 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 2babbe712d3c321f1a3a0dc905168b3b1e7ebd1d..70078b68f9621dc25b62f1d36d2880d96b5e1c15 100644 (file)
--- 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 fc2711058bd57fb1c386341e5a4e3075d1cff322..6383d2c698d3adffc16d4e18ee081dd5e39ca552 100644 (file)
--- 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 2e5a709016a0d4b3ccbd66544891e31c47d05ba3..b47e4b3042e615099fb7235b8b00afa195d772ae 100644 (file)
--- 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 6b9062d5d099e5f736e674653a5a206eb883feef..4c38772efb5619f311044df5685314c8e1be061a 100644 (file)
--- 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 463500b40f29110c8e4da9cd681467d67b4eb2e7..744135e935c66b3fab8cd335fd17039e998b572d 100644 (file)
--- 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 f67ed0fc8663c861e323d20cf4f0a24eca4d1465..628b864015a4603903f5c88531aba70fffa9f19c 100644 (file)
--- 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 b7a90f820db4974341cc46c25aed02010e24a393..4d1731de7c058da2106caa25045aa288db63e97a 100644 (file)
--- 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 ab5521a7b3cc3ed912dfa5a4a7a38d7fe53ef0b1..fd36b4c13dc895dcd1b25b2722ae8ea44aa0bf03 100644 (file)
--- 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 c094d64e1c520b605768df6c8249d8c0d3d7efbc..4e846285a8c5ea9a416af94349ac7f9497848dcb 100644 (file)
--- 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 4fea5af8e341b4f43a49e64317b21a0ce925f716..f76a9d4423cd8083bdfd068ce328ea95c7b6d57f 100644 (file)
--- 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 2f3b6b6a5791fb52790aa2d5aae1be102e3c35ed..df48eda2f4983b9726d8ca42bce69ea27d9d6cd2 100644 (file)
--- 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 0fee334e771603f02895b12461e1eb23ba1cb4c6..43c7a3b917dc5d5e995772c28a7b07c581ea5e14 100644 (file)
--- 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 d89c6e287cbd7fb7dc19cd8225db5f4d4f507f0d..eace9e88c7b0ab67d2e85f64a68f393ff572b5e5 100644 (file)
--- 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 3a4267bf9740d55c9b577ecb8514a48e7bafa916..8e46efce8a19314923552dc530ebe050c58b0d36 100644 (file)
--- 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 5a98e5593065e8cb6b8c17c1efaa613d179c741a..6ccec8c9b67be2ea7a7f2ee014272f3050cb9ce5 100644 (file)
--- 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 b318b1e3b511ebf7f38ac13ebf35e266b6eb8522..35fb3334e0af83f72ad909e52c5ea5ee78fec2c5 100644 (file)
--- 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 c7b7ad0a431ada7b7bf5ebb65a2e301c3cc62b16..562acd69225ff9568f2466933661762699079eda 100644 (file)
--- 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 8197fcd8f71a821be79b21c975d1f9d78c073620..7528b2d97f220b4508fe674bd1d107663cf451c5 100644 (file)
--- 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 2ab3a262ac67e79a33c04040b909451ab1ad9303..82bccdfd5109ab2bfd5f1b477d75b0c1a10ad583 100644 (file)
--- 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 392e6b0184eb1209eca2be7f7c4cc9ce86b193b8..ea460eb1df755a4df0ecc60ede9a3a9528489843 100644 (file)
--- 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 85ec6cec66c30206b5f6b9cad624cf0e10e93bbc..4d6c9b22783b3c50289479a664fa947d7a1bc37a 100644 (file)
--- 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 ab7a7b1f6b5d5e7f58f1c7291112e1678d76fb7c..9bcc5a93c9dc82161f42724aae17640db4a3ffff 100644 (file)
--- 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 690ba1ab8f6febb4ab85705b84c046eb31c01671..c3763eb6a5182c7ff8a82be621b71a30967539e4 100644 (file)
--- 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 402ed199dc422cf58f9387d4636187b1b2c6c987..a7d03fe6d67b27a61c7a4eebd268cc077d632e6c 100644 (file)
--- 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 f173c9a5c1811089e87a724890a67acf64fa4477..71d6910204a1acc7c32e51554b3322699d87104a 100644 (file)
--- 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 8139175e18e971bdbc3ed6c302249ab503e96e56..8f73d37d033b7d63a3ed7b1899baee666d6728f1 100644 (file)
--- 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 cfd1fc74f5b2d92f09115ac0c9f79e4a58010ff6..cc61637de453ef6fa5a24f9a4f2dd24b44cbafdf 100644 (file)
--- 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 4f0a02231700bfad857bd765c752a33145d2995e..eabc0ba8925e86618c66527e527b95db5a6e5b54 100644 (file)
--- 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 7374f7e9b54ae96bcd293c01f4b3c084215aeab5..afd8f5af03e286738f02caed6c9cb2760778cd0e 100644 (file)
--- 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 bfa40f3e627b4a2a178e739edbdb1a6bdc4ae724..5c2757255db6ad787772d3a95de470dffdbea5a1 100644 (file)
--- 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 edab9feeabc33f106841df521d8937b340bd3b0e..f03ecca2ee2aaa7195ecc9dafb2654cae46eda65 100644 (file)
--- 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 ba43be59b278d70829b501a044e74dee485fbe1a..34b16c4c46df37b0f855ed0cadac89ff1e601f0e 100644 (file)
--- 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 b0de0d843b8a20117c63cdf77deb5b9e2e0c8825..950d5650c18de6654c8ce18e9bea8db493873f53 100644 (file)
--- 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 2e496022ded0ad9c3e8509d1ae029babe23da539..327be53a74c0fd7bc9122ab5159aaa118ec1b404 100644 (file)
--- 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 516746b1046a935848bd06fb020202e5d011bf4c..bdec3e51465256e3489859ea13ea66cce6647876 100644 (file)
--- 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 f5ebbf776d56a414c7874109874886e2a2f9e9bd..40357c4550b1154aabb48cd6db5e6d0585bd46b4 100644 (file)
--- 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 8914d874027394dd1df068045da844dea702e416..ce8f9c155947e34062fd7edb6a0b098e05942aa0 100644 (file)
--- 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 babb9b2752b201ec119fe6be6456db69473a013d..4989b93638b1c83c8145d6b2cb5713b3e55ac07b 100644 (file)
--- 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 11ebfcadc97e049fe632210c2e3b28b1efb0b394..f0ba5bc98c12b3dbb9538f1e8353c409e423f0b5 100644 (file)
--- 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 560f63ddbaa2783d623aeba7085f4675820a392d..52cfb93c72519f4d3d1b74cb66db144479c84734 100644 (file)
--- 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 f6d121731aea089e09f222a7755514cb0dfa985e..d6e2876c85ff6980667366d727e2e83a2d2dbd81 100644 (file)
--- 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 c4d0eef4d74d48579ad1f5a3c13a4c7e91455012..54098d23419b85ee8ab289e93a1ae99721bae3d4 100644 (file)
--- 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 c7e78cd3a3e638ccdc4ec5dcab506f8ed5df69d9..90d3dcdd7994998cc340c7df3c323b79fdeb3de6 100644 (file)
--- 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 3ca11d9fc0dcb890372688f9115ab775ec35f0ff..5a240bc5932ea48f8164c503227e47ecfd9c3c79 100644 (file)
--- 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 455ee884b000a7497c89e49971eba2ac7035cb1a..4a215abf8a481390dd2dbc6a62f48073af033f06 100644 (file)
--- 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 c9e94a276ef56fdcd0298c63f061a1602dcf2837..d71f8c2d885690a8ba7cb93885d90399a3125acf 100644 (file)
--- 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 e9198932653aeffd11326908bb4b59ff6e6dfa13..bdfa03aa1a1d3d640bc3fecd244c2b37806dd3f3 100644 (file)
--- 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 fde4a379020cd0de123889d7f0d0585f99488001..7bf470e8ddb2083c16b4ce46293dcca5cad157b1 100644 (file)
--- 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 1079fe643d55b801563e1119455607e2aac40e2a..6e04b0861cdfc671af3379b65fe9822545edc379 100644 (file)
--- 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 e804635be2b07309545a0056493bea00ccdc0a54..517290b961e836f534290fe842eab29028855e1b 100644 (file)
--- 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 70b37799479cc2ea5fa70669bdc638db2845b6dc..2d94b047fe32a20746b7787e290ad49d5f890cb7 100644 (file)
--- 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 ab8777a79f84811ab0798c6024a29db6ce06644d..6b33f58f57d1961d8d5bc4a4ba186b963e120188 100644 (file)
--- 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 41939334be08c075abc126eb4c43e9b28675edd3..5ef17a932cbb0c6a491460a3f149bd8262a1a194 100644 (file)
--- 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 e8f8ebd76cf6313a566aceb9ae6e2df7e5958482..82a2737a8d7f166ee775fbe19cad4595c370af9a 100644 (file)
--- 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 15c46e3526f1f8748ed52875a274da167cd46b30..f6124bbb8e7ce46aea17898f3aec2176c190e815 100644 (file)
--- 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 03bc38cdf7b483693c2bea04a043101cbee94409..0ee9eb7955565dcda36336773d167e8a8fc0480f 100644 (file)
--- 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 939b1699d6b34069fa968450cc8e4d6a0b1eced5..15d9aa4ea00039aae32ee6d6c43ebdb491361637 100644 (file)
--- 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 2e677f0b240c35c4d32369e8522c38a574c46c18..fc145a8ce8f7a8ba3caa9e5cddcd462a25ca97ce 100644 (file)
--- 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 9711f98da1998b7c2e4ce14754433cbecb05126f..90b6c908a2920121812cee5dda9825ec19a86e0f 100644 (file)
--- 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 4bb604e5a44b249c5cbe97098c41ed3a5add6a03..f6b1a95b7a946905827c71632afb991d858fa906 100644 (file)
--- 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 b0675b74c3b96224caf31246dc8f2a1b766cf10e..f9c2a57c0046d6dc09168536009911f0fea03b21 100644 (file)
--- 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 8cb1aaee3313c8301e48a5f8b99866fcb6b7bb26..22991245a875dd9c34da44db0786abde617590e3 100644 (file)
--- 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 9ffa8671d5ead592c0b95a9736acabd5ee065ed5..b82f913b5ca9e0111fab49884df9102892c17b3b 100644 (file)
--- 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 f1459a7989e6f8d59606650ec05e6d9ea2a38fad..d6938f7da0ef3c5ba5df1a1bf83f8c9cc72199b8 100644 (file)
--- 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);

diff --git a/crypto/bf/Makefile.ssl b/crypto/bf/Makefile.ssl
index 99e2807b256775455352caf7b36270c246397e7e..65ded36f18afc52f82d0c6fc1464ce36cd5d544f 100644 (file)
--- a/crypto/bf/Makefile.ssl
+++ b/crypto/bf/Makefile.ssl
@@ -71,15 +71,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/bf/bf_cbc.c b/crypto/bf/bf_cbc.c
index 90f1ffef2bc42bdb851d52d737b1c04922cf55e9..95d1cdcdf92798e12d108bb93092bd2246d1df06 100644 (file)
--- a/crypto/bf/bf_cbc.c
+++ b/crypto/bf/bf_cbc.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 #include "bf_locl.h"
 
 void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length,

diff --git a/crypto/bf/bf_cfb64.c b/crypto/bf/bf_cfb64.c
index 308b965867d945f87614e6b772b6f82fd4d5cb7a..1fb8905f49e6a7f6e3083c8cba347834fe0af356 100644 (file)
--- a/crypto/bf/bf_cfb64.c
+++ b/crypto/bf/bf_cfb64.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 #include "bf_locl.h"
 
 /* The input and output encrypted as though 64bit cfb mode is being

diff --git a/crypto/bf/bf_ecb.c b/crypto/bf/bf_ecb.c
index 7abe20979d49dd212c8ca7b6e3e69b759d9c0241..9f8a24cdff57ec8507773f4326b29f0e35bfc61d 100644 (file)
--- a/crypto/bf/bf_ecb.c
+++ b/crypto/bf/bf_ecb.c
@@ -56,9 +56,9 @@
  * [including the GNU Public Licence.]
  */
 
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 #include "bf_locl.h"
-#include "opensslv.h"
+#include <openssl/opensslv.h>
 
 /* Blowfish as implemented from 'Blowfish: Springer-Verlag paper'
  * (From LECTURE NOTES IN COIMPUTER SCIENCE 809, FAST SOFTWARE ENCRYPTION,

diff --git a/crypto/bf/bf_enc.c b/crypto/bf/bf_enc.c
index 9ae52425aed3fbc4bd0211a3baa4a771a454917a..f8a95e21420253ebdb2959c1a88dc2d780719482 100644 (file)
--- a/crypto/bf/bf_enc.c
+++ b/crypto/bf/bf_enc.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 #include "bf_locl.h"
 
 /* Blowfish as implemented from 'Blowfish: Springer-Verlag paper'

diff --git a/crypto/bf/bf_locl.h b/crypto/bf/bf_locl.h
index c2b02439eca5f282abfbae71cf7e01ffd37e9dba..7936e6c56a232db66e9af10ea263453c4d3b6f1d 100644 (file)
--- a/crypto/bf/bf_locl.h
+++ b/crypto/bf/bf_locl.h
@@ -58,7 +58,7 @@
 
 #ifndef _HEADER_BF_LOCL_H
 #define _HEADER_BF_LOCL_H
-#include "opensslconf.h" /* BF_PTR, BF_PTR2 */
+#include <openssl/opensslconf.h> /* BF_PTR, BF_PTR2 */
 
 #undef c2l
 #define c2l(c,l)       (l =((unsigned long)(*((c)++)))    , \

diff --git a/crypto/bf/bf_ofb64.c b/crypto/bf/bf_ofb64.c
index 381f6a2a9cff3be6ebc5af09d76936ad3feb9d37..8ceb8d9bdaa0f6d0c135c5f28a857555217dd9ea 100644 (file)
--- a/crypto/bf/bf_ofb64.c
+++ b/crypto/bf/bf_ofb64.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 #include "bf_locl.h"
 
 /* The input and output encrypted as though 64bit ofb mode is being

diff --git a/crypto/bf/bf_opts.c b/crypto/bf/bf_opts.c
index e818b76e5ddc28cb4fa523ef30b414cea850db6c..f63fa8e168ea8b3b8bd54d5ce2cbb2635ea50dfe 100644 (file)
--- a/crypto/bf/bf_opts.c
+++ b/crypto/bf/bf_opts.c
@@ -98,7 +98,7 @@ struct tms {
 #include <sys/param.h>
 #endif
 
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 
 #define BF_DEFAULT_OPTIONS
 

diff --git a/crypto/bf/bf_skey.c b/crypto/bf/bf_skey.c
index f6c45535e112862e87ef04a95c3b843a5e4aa30e..eefa8e6f51dc53edf0fcb08989be7c0ff7386415 100644 (file)
--- a/crypto/bf/bf_skey.c
+++ b/crypto/bf/bf_skey.c
@@ -58,7 +58,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 #include "bf_locl.h"
 #include "bf_pi.h"
 

diff --git a/crypto/bf/bfspeed.c b/crypto/bf/bfspeed.c
index 983eba52f0b31c6e562325c46a07c531b9353ab9..8e770a9f837cebd2e33ca64f8daa1421fed3b604 100644 (file)
--- a/crypto/bf/bfspeed.c
+++ b/crypto/bf/bfspeed.c
@@ -98,7 +98,7 @@ struct tms {
 #include <sys/param.h>
 #endif
 
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 
 /* The following if from times(3) man page.  It may need to be changed */
 #ifndef HZ

diff --git a/crypto/bf/bftest.c b/crypto/bf/bftest.c
index 06b528f64b95acef0cdb229451ce25460f8a5c7b..df4c211d9db72a478a0338b8e96cac7c35b971f7 100644 (file)
--- a/crypto/bf/bftest.c
+++ b/crypto/bf/bftest.c
@@ -62,7 +62,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 
 char *bf_key[2]={
        "abcdefghijklmnopqrstuvwxyz",

diff --git a/crypto/bio/Makefile.ssl b/crypto/bio/Makefile.ssl
index fcf82783a453ecf550441fd32c52a5f62b779acf..c8d20e7a4ebf317a2598cc22792aee19d79ba78b 100644 (file)
--- a/crypto/bio/Makefile.ssl
+++ b/crypto/bio/Makefile.ssl
@@ -55,15 +55,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/bio/b_dump.c b/crypto/bio/b_dump.c
index 839dfeb15e69bd48ee6ffa4b679abddb9ae19003..71bbce8ce180421ad2becf6e40e943b5a9e5417b 100644 (file)
--- a/crypto/bio/b_dump.c
+++ b/crypto/bio/b_dump.c
@@ -62,7 +62,7 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bio.h"
+#include <openssl/bio.h>
 
 #define TRUNCATE
 #define DUMP_WIDTH     16

diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index cdadeb839a0c66d7f0d16dcedc28b494d1ffb88b..5fb89d4c2c6bf8b4120229cfd31e6cab48edb7e8 100644 (file)
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -62,7 +62,7 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bio.h"
+#include <openssl/bio.h>
 
 int BIO_printf ( VAR_PLIST( BIO *, bio ) )
 VAR_ALIST

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index ff1a0a7dd0e5e3c3603054323cfc28f2053f7268..328394efe42614d41e20af26e19a0e405268a155 100644 (file)
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -63,7 +63,7 @@
 #include <errno.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
-#include "bio.h"
+#include <openssl/bio.h>
 
 /*     BIOerr(BIO_F_WSASTARTUP,BIO_R_WSASTARTUP ); */
 

diff --git a/crypto/bio/bf_buff.c b/crypto/bio/bf_buff.c
index c0f591880c77c3c08503b10ff969aa00f95a2563..d239fc000853bf7fad615227f64ef49a8af38488 100644 (file)
--- a/crypto/bio/bf_buff.c
+++ b/crypto/bio/bf_buff.c
@@ -59,8 +59,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "bio.h"
-#include "evp.h"
+#include <openssl/bio.h>
+#include <openssl/evp.h>
 
 #ifndef NOPROTO
 static int buffer_write(BIO *h,char *buf,int num);

diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c
index 502973808cc9fa36f6da76972ef16230b24f8ec6..1486996943a3f1fbd6fce6198def0fa4b0b16fbf 100644 (file)
--- a/crypto/bio/bf_nbio.c
+++ b/crypto/bio/bf_nbio.c
@@ -59,9 +59,9 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "rand.h"
-#include "bio.h"
-#include "evp.h"
+#include <openssl/rand.h>
+#include <openssl/bio.h>
+#include <openssl/evp.h>
 
 /* BIO_put and BIO_get both add to the digest,
  * BIO_gets returns the digest */

diff --git a/crypto/bio/bf_null.c b/crypto/bio/bf_null.c
index 8bbf3531461c48ac044610aee1ded4f9cb1a7253..c2e782f1ea7d01d21cec8139d531a7e0c8a56e08 100644 (file)
--- a/crypto/bio/bf_null.c
+++ b/crypto/bio/bf_null.c
@@ -59,8 +59,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "bio.h"
-#include "evp.h"
+#include <openssl/bio.h>
+#include <openssl/evp.h>
 
 /* BIO_put and BIO_get both add to the digest,
  * BIO_gets returns the digest */

diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index 0b0ce795d75c1a8a7ee9b90d4ed70d5d09c11dcf..99a3c92b75b116839dd53f4cede1620775704dac 100644 (file)
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -63,7 +63,7 @@
 extern "C" {
 #endif
 
-#include "crypto.h"
+#include <openssl/crypto.h>
 
 /* These are the 'types' of BIOs */
 #define BIO_TYPE_NONE          0

diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c
index a37d8b4c291773fba569bf4a477f766754c5a1c7..37c7c2266683b1c3397206ed739fa98b85af63ea 100644 (file)
--- a/crypto/bio/bio_cb.c
+++ b/crypto/bio/bio_cb.c
@@ -60,8 +60,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include "cryptlib.h"
-#include "bio.h"
-#include "err.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
 
 long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp,
             int argi, long argl, long ret)

diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c
index 78c41fdbef813356ecfdf8e95bb33c301de093fd..3493252826fd5cc5df52e72bd697a4c2cf76aa7b 100644 (file)
--- a/crypto/bio/bio_err.c
+++ b/crypto/bio/bio_err.c
@@ -56,8 +56,8 @@
  * [including the GNU Public Licence.]
  */
 #include <stdio.h>
-#include "err.h"
-#include "bio.h"
+#include <openssl/err.h>
+#include <openssl/bio.h>
 
 /* BEGIN ERROR CODES */
 #ifndef NO_ERR

diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c
index a73bca4b67d6f7f45a4d00244f0a96208484ca38..c0bda7a950fcfa551f1f8fc58cacb038fb764778 100644 (file)
--- a/crypto/bio/bio_lib.c
+++ b/crypto/bio/bio_lib.c
@@ -58,10 +58,10 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "crypto.h"
+#include <openssl/crypto.h>
 #include "cryptlib.h"
-#include "bio.h"
-#include "stack.h"
+#include <openssl/bio.h>
+#include <openssl/stack.h>
 
 static STACK *bio_meth=NULL;
 static int bio_meth_num=0;

diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index a179dfa3dd486aec2c971e66b7d05444f8915dbb..083d1b584c63e5b121f07db0a0fd6278944da74a 100644 (file)
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -62,7 +62,7 @@
 #include <errno.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
-#include "bio.h"
+#include <openssl/bio.h>
 
 /*     BIOerr(BIO_F_WSASTARTUP,BIO_R_WSASTARTUP ); */
 

diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index 4c5c3c67a3d45499df6dcf2ba36ac7ba42bfe630..83ba60edfbb102ab8d3c64eed1f0dc9c2e509686 100644 (file)
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -62,7 +62,7 @@
 #include <errno.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
-#include "bio.h"
+#include <openssl/bio.h>
 
 /*     BIOerr(BIO_F_WSASTARTUP,BIO_R_WSASTARTUP ); */
 

diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index 3ed5dab90427c79349f105688f6af34d02390b50..ab73b23d0ada0e7f82db3475775e16959f1ce113 100644 (file)
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -68,8 +68,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "bio.h"
-#include "err.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
 
 #if !defined(NO_STDIO)
 

diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c
index e434f2905474470f6806e89d9120cb08ba162b7c..c4e991bccae6fc52b76572ccf4567bd1db7f6be0 100644 (file)
--- a/crypto/bio/bss_log.c
+++ b/crypto/bio/bss_log.c
@@ -75,8 +75,8 @@
 #endif
 
 #include "cryptlib.h"
-#include "buffer.h"
-#include "err.h"
+#include <openssl/buffer.h>
+#include <openssl/err.h>
 #ifndef NO_SYSLOG
 
 

diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c
index 893664777c5f9cfc5cb03f71976777a3f46e0d5d..edde3b4aa3747095323348a3c7e69d1cb3f38a7c 100644 (file)
--- a/crypto/bio/bss_mem.c
+++ b/crypto/bio/bss_mem.c
@@ -59,7 +59,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "bio.h"
+#include <openssl/bio.h>
 
 #ifndef NOPROTO
 static int mem_write(BIO *h,char *buf,int num);

diff --git a/crypto/bio/bss_null.c b/crypto/bio/bss_null.c
index 52f5da8b123cc4bbbaed6425e6fca065f017a97d..b2eb9ad141705485c184ab76a4883ac623511984 100644 (file)
--- a/crypto/bio/bss_null.c
+++ b/crypto/bio/bss_null.c
@@ -59,7 +59,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "bio.h"
+#include <openssl/bio.h>
 
 #ifndef NOPROTO
 static int null_write(BIO *h,char *buf,int num);

diff --git a/crypto/bio/bss_rtcp.c b/crypto/bio/bss_rtcp.c
index e07958cd77bc9f534f87d41af69fbdfc85c4c537..925e9c811a35a265c8435097c1efd30a6d0ef7a2 100644 (file)
--- a/crypto/bio/bss_rtcp.c
+++ b/crypto/bio/bss_rtcp.c
@@ -65,7 +65,7 @@
 #include <string.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "bio.h"
+#include <openssl/bio.h>
 
 #include <iodef.h>             /* VMS IO$_ definitions */
 extern int SYS$QIOW();

diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
index 049606ee5df6596c1e2bf3dc2af6c3aa236787c5..89b1dcab3746652601b4ac8146718a670a3af41a 100644 (file)
--- a/crypto/bio/bss_sock.c
+++ b/crypto/bio/bss_sock.c
@@ -62,7 +62,7 @@
 #include <errno.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
-#include "bio.h"
+#include <openssl/bio.h>
 
 #ifndef BIO_FD
 #ifndef NOPROTO

diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl
index 873b199f64c1b4641306b2ff91dab71370c948d1..22917742a01bb73d142bf955861fa0d94d634610 100644 (file)
--- a/crypto/bn/Makefile.ssl
+++ b/crypto/bn/Makefile.ssl
@@ -114,15 +114,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;
 
 exptest:

diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h
index fe764ded39cdc471a61ae92e6d3b8b80a7d183e9..a90fd5938739e0dc8ebc4401d994f3485ed52d40 100644 (file)
--- a/crypto/bn/bn.h
+++ b/crypto/bn/bn.h
@@ -59,7 +59,7 @@
 #ifndef HEADER_BN_H
 #define HEADER_BN_H
 
-#include "opensslconf.h"
+#include <openssl/opensslconf.h>
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/crypto/bn/bn_err.c b/crypto/bn/bn_err.c
index 2041b018ea3956a4f7e3488327af8b1198bfbbe8..ec11ddd7737da7dc09c97cfa095d7d76d578a6da 100644 (file)
--- a/crypto/bn/bn_err.c
+++ b/crypto/bn/bn_err.c
@@ -56,8 +56,8 @@
  * [including the GNU Public Licence.]
  */
 #include <stdio.h>
-#include "err.h"
-#include "bn.h"
+#include <openssl/err.h>
+#include <openssl/bn.h>
 
 /* BEGIN ERROR CODES */
 #ifndef NO_ERR

diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
index 306dd679c1da8e3df0d8dc0db100cb4b952b0d16..afa81b427553e5a6f5eeb53a32664a93cb1c192b 100644 (file)
--- a/crypto/bn/bn_lcl.h
+++ b/crypto/bn/bn_lcl.h
@@ -59,7 +59,7 @@
 #ifndef HEADER_BN_LCL_H
 #define HEADER_BN_LCL_H
 
-#include "bn.h"
+#include <openssl/bn.h>
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/crypto/bn/bn_m.c b/crypto/bn/bn_m.c
index 555514074c1038b64aa002542d990482558da5ba..8f9ea507e359a623c4b13c6bf090a41b39cb9f77 100644 (file)
--- a/crypto/bn/bn_m.c
+++ b/crypto/bn/bn_m.c
@@ -59,7 +59,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include "bn_lcl.h"
-#include "stack.h"
+#include <openssl/stack.h>
 
 int limit=16;
 

diff --git a/crypto/bn/bn_opts.c b/crypto/bn/bn_opts.c
index 2d04184c885419111e7f8100da9e1c158b20bc75..381be529b2f6f7cc2017204b7808bf00f9ae527e 100644 (file)
--- a/crypto/bn/bn_opts.c
+++ b/crypto/bn/bn_opts.c
@@ -62,10 +62,10 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <string.h>
-#include "crypto.h"
-#include "tmdiff.h"
-#include "bn.h"
-#include "err.h"
+#include <openssl/crypto.h>
+#include <openssl/tmdiff.h>
+#include <openssl/bn.h>
+#include <openssl/err.h>
 
 #define DEFAULT_SIZE   512
 #define DEFAULT_TIME   3

diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c
index bd9900db4dee7c65b2c55fc554937fe2f7e88dbf..6b96e18883002c8b2856386982b57229dc1b4c08 100644 (file)
--- a/crypto/bn/bn_prime.c
+++ b/crypto/bn/bn_prime.c
@@ -60,7 +60,7 @@
 #include <time.h>
 #include "cryptlib.h"
 #include "bn_lcl.h"
-#include "rand.h"
+#include <openssl/rand.h>
 
 /* The quick seive algorithm approach to weeding out primes is
  * Philip Zimmermann's, as implemented in PGP.  I have had a read of

diff --git a/crypto/bn/bn_print.c b/crypto/bn/bn_print.c
index 9383ab2ae576168448990482306a001e996b1218..1ec49ed3ccc84e76b0f3bfb18fca65d65400f0c0 100644 (file)
--- a/crypto/bn/bn_print.c
+++ b/crypto/bn/bn_print.c
@@ -59,7 +59,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include "cryptlib.h"
-#include "buffer.h"
+#include <openssl/buffer.h>
 #include "bn_lcl.h"
 
 const static char *Hex="0123456789ABCDEF";

diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index 7d6f635b70c771a26d1454d4e9945da2acbea866..91b8e34ae65b364c03ed333c5f181ed6840c7aca 100644 (file)
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -60,7 +60,7 @@
 #include <time.h>
 #include "cryptlib.h"
 #include "bn_lcl.h"
-#include "rand.h"
+#include <openssl/rand.h>
 
 int BN_rand(BIGNUM *rnd, int bits, int top, int bottom)
        {

diff --git a/crypto/bn/bnspeed.c b/crypto/bn/bnspeed.c
index af4ebe7986c44d8c5b0a791ad0b031fcb7cce593..6018ca979b7c15f2c7bf15f037ea68a6174cada8 100644 (file)
--- a/crypto/bn/bnspeed.c
+++ b/crypto/bn/bnspeed.c
@@ -66,8 +66,8 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <string.h>
-#include "crypto.h"
-#include "err.h"
+#include <openssl/crypto.h>
+#include <openssl/err.h>
 
 #ifndef MSDOS
 #define TIMES
@@ -100,8 +100,8 @@ struct tms {
 #include <sys/param.h>
 #endif
 
-#include "bn.h"
-#include "x509.h"
+#include <openssl/bn.h>
+#include <openssl/x509.h>
 
 /* The following if from times(3) man page.  It may need to be changed */
 #ifndef HZ

diff --git a/crypto/bn/bntest.c b/crypto/bn/bntest.c
index ab93138de8de62c201eaf25221e4ff5c7a92cf98..fb9d2a99f83cf5de5bf87f0447470855d088cabe 100644 (file)
--- a/crypto/bn/bntest.c
+++ b/crypto/bn/bntest.c
@@ -59,12 +59,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "e_os.h"
-#include "bio.h"
-#include "bn.h"
-#include "rand.h"
-#include "x509.h"
-#include "err.h"
+#include <openssl/e_os.h>
+#include <openssl/bio.h>
+#include <openssl/bn.h>
+#include <openssl/rand.h>
+#include <openssl/x509.h>
+#include <openssl/err.h>
 
 #ifdef WINDOWS
 #include "../bio/bss_file.c"

diff --git a/crypto/bn/d.c b/crypto/bn/d.c
index f738b5025ee018fc5038b1c413fa0a9c76d8b6bd..ced2291b25555f35e034e5ced64e83ad233e276e 100644 (file)
--- a/crypto/bn/d.c
+++ b/crypto/bn/d.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "bio.h"
+#include <openssl/bio.h>
 #include "bn_lcl.h"
 
 #define SIZE_A (100*4+4)

diff --git a/crypto/bn/exp.c b/crypto/bn/exp.c
index dd49d967a4e0151d8464f69e862e188c9e3b780d..ec443459d81818a916972b10c68337e84576d17a 100644 (file)
--- a/crypto/bn/exp.c
+++ b/crypto/bn/exp.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "tmdiff.h"
+#include <openssl/tmdiff.h>
 #include "bn_lcl.h"
 
 #define SIZE   256

diff --git a/crypto/bn/expspeed.c b/crypto/bn/expspeed.c
index 7b7652d022f022a8614a0d17057310de8abc6050..07c36b2dd241c7b1a09ad49c59c06b9a171c4b1f 100644 (file)
--- a/crypto/bn/expspeed.c
+++ b/crypto/bn/expspeed.c
@@ -66,8 +66,8 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <string.h>
-#include "crypto.h"
-#include "err.h"
+#include <openssl/crypto.h>
+#include <openssl/err.h>
 
 #ifndef MSDOS
 #define TIMES
@@ -100,8 +100,8 @@ struct tms {
 #include <sys/param.h>
 #endif
 
-#include "bn.h"
-#include "x509.h"
+#include <openssl/bn.h>
+#include <openssl/x509.h>
 
 /* The following if from times(3) man page.  It may need to be changed */
 #ifndef HZ

diff --git a/crypto/bn/exptest.c b/crypto/bn/exptest.c
index 4816344f560904d61ed204b2c05f2d7947c2af8a..08039313a2bb52b69b33a865148d8766ecdb0d74 100644 (file)
--- a/crypto/bn/exptest.c
+++ b/crypto/bn/exptest.c
@@ -59,10 +59,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "bio.h"
-#include "bn.h"
-#include "rand.h"
-#include "err.h"
+#include <openssl/bio.h>
+#include <openssl/bn.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
 #ifdef WINDOWS
 #include "../bio/bss_file.c"
 #endif

diff --git a/crypto/buffer/Makefile.ssl b/crypto/buffer/Makefile.ssl
index 8142ac2ff80163a6566c93304a804bc002c0149e..63e118826cd5a28f0d90e492e396890d7de2021c 100644 (file)
--- a/crypto/buffer/Makefile.ssl
+++ b/crypto/buffer/Makefile.ssl
@@ -47,15 +47,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/buffer/buf_err.c b/crypto/buffer/buf_err.c
index 2f74b5f65b2300255f21d89b475ab37ae308a2b5..235753a660049db3b38f430073de6c97ac40a515 100644 (file)
--- a/crypto/buffer/buf_err.c
+++ b/crypto/buffer/buf_err.c
@@ -56,8 +56,8 @@
  * [including the GNU Public Licence.]
  */
 #include <stdio.h>
-#include "err.h"
-#include "buffer.h"
+#include <openssl/err.h>
+#include <openssl/buffer.h>
 
 /* BEGIN ERROR CODES */
 #ifndef NO_ERR

diff --git a/crypto/buffer/buffer.c b/crypto/buffer/buffer.c
index da19244181de97d18ab50c583ca0892f4d0c9bab..c3a108ea52115af420c0c005f468e0d443e27208 100644 (file)
--- a/crypto/buffer/buffer.c
+++ b/crypto/buffer/buffer.c
@@ -58,7 +58,7 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "buffer.h"
+#include <openssl/buffer.h>
 
 BUF_MEM *BUF_MEM_new(void)
        {

diff --git a/crypto/cast/Makefile.ssl b/crypto/cast/Makefile.ssl
index a976ea1ff1266c902648d0fdcf7e408d4767d68f..bbb329e22fad0be63c3e87cdb446c22dcece4ee9 100644 (file)
--- a/crypto/cast/Makefile.ssl
+++ b/crypto/cast/Makefile.ssl
@@ -74,15 +74,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/cast/c_cfb64.c b/crypto/cast/c_cfb64.c
index a9d32517c432a688a490ddd1f9bbe37813ec1629..50d234b4667a6a3b4aaad1bee8715f13c9cee3c6 100644 (file)
--- a/crypto/cast/c_cfb64.c
+++ b/crypto/cast/c_cfb64.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#include "cast.h"
+#include <openssl/cast.h>
 #include "cast_lcl.h"
 
 /* The input and output encrypted as though 64bit cfb mode is being

diff --git a/crypto/cast/c_ecb.c b/crypto/cast/c_ecb.c
index a407a6d1192642a9889b73c11cf3fab2136c6049..4b523ffc7576e2be783d35c56ff2c668634747a9 100644 (file)
--- a/crypto/cast/c_ecb.c
+++ b/crypto/cast/c_ecb.c
@@ -56,9 +56,9 @@
  * [including the GNU Public Licence.]
  */
 
-#include "cast.h"
+#include <openssl/cast.h>
 #include "cast_lcl.h"
-#include "opensslv.h"
+#include <openssl/opensslv.h>
 
 char *CAST_version="CAST" OPENSSL_VERSION_PTEXT;
 

diff --git a/crypto/cast/c_enc.c b/crypto/cast/c_enc.c
index 2a26e277c83b7ae63c98ab1bda7234a110fca988..b62b4680b0c0d3f877da075207beeece535a1487 100644 (file)
--- a/crypto/cast/c_enc.c
+++ b/crypto/cast/c_enc.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#include "cast.h"
+#include <openssl/cast.h>
 #include "cast_lcl.h"
 
 void CAST_encrypt(CAST_LONG *data, CAST_KEY *key)

diff --git a/crypto/cast/c_ofb64.c b/crypto/cast/c_ofb64.c
index 1ccaec7976991121fc8abe23f6af5954bf889649..4249870d9e34e6a7abcca751a7888f6a52d267a5 100644 (file)
--- a/crypto/cast/c_ofb64.c
+++ b/crypto/cast/c_ofb64.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#include "cast.h"
+#include <openssl/cast.h>
 #include "cast_lcl.h"
 
 /* The input and output encrypted as though 64bit ofb mode is being

diff --git a/crypto/cast/c_skey.c b/crypto/cast/c_skey.c
index 7611f7a1e4a642d959e83c8a5215469506f7f08d..acf2c3eeb51e38fe81b0c63d42eb193e599e760f 100644 (file)
--- a/crypto/cast/c_skey.c
+++ b/crypto/cast/c_skey.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#include "cast.h"
+#include <openssl/cast.h>
 #include "cast_lcl.h"
 #include "cast_s.h"
 

diff --git a/crypto/cast/cast_spd.c b/crypto/cast/cast_spd.c
index 5e3716af84ac854ba3e2fca426131ed370c6ceea..8163709fed85e5e01c5bbff2efbc32442bf50811 100644 (file)
--- a/crypto/cast/cast_spd.c
+++ b/crypto/cast/cast_spd.c
@@ -98,7 +98,7 @@ struct tms {
 #include <sys/param.h>
 #endif
 
-#include "cast.h"
+#include <openssl/cast.h>
 
 /* The following if from times(3) man page.  It may need to be changed */
 #ifndef HZ

diff --git a/crypto/cast/castopts.c b/crypto/cast/castopts.c
index 2c9e550cbd2ec4742d618c3953d1bbc6ad246adb..03398af7cc8e756cdc59d34bac891798f6935a78 100644 (file)
--- a/crypto/cast/castopts.c
+++ b/crypto/cast/castopts.c
@@ -98,7 +98,7 @@ struct tms {
 #include <sys/param.h>
 #endif
 
-#include "cast.h"
+#include <openssl/cast.h>
 
 #define CAST_DEFAULT_OPTIONS
 

diff --git a/crypto/cast/casttest.c b/crypto/cast/casttest.c
index 703926680380e6c4565ec623f354e62e0e124e16..a8a707c711f57c93552a6046eca8e667979db6e3 100644 (file)
--- a/crypto/cast/casttest.c
+++ b/crypto/cast/casttest.c
@@ -59,7 +59,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "cast.h"
+#include <openssl/cast.h>
 
 #define FULL_TEST
 

diff --git a/crypto/comp/Makefile.ssl b/crypto/comp/Makefile.ssl
index 26e94b5590beac5af67baebc900ef97a3d90a9b4..511c955efa988ddf6f7119c807dd5304837abda2 100644 (file)
--- a/crypto/comp/Makefile.ssl
+++ b/crypto/comp/Makefile.ssl
@@ -50,15 +50,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/comp/c_rle.c b/crypto/comp/c_rle.c
index 32fa05fa9ae984383a3c3f6b6a4049d4f79181ee..1a819e3737d9085d8221bc786eaad514c1b7371e 100644 (file)
--- a/crypto/comp/c_rle.c
+++ b/crypto/comp/c_rle.c
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "objects.h"
-#include "comp.h"
+#include <openssl/objects.h>
+#include <openssl/comp.h>
 
 static int rle_compress_block(COMP_CTX *ctx, unsigned char *out,
        unsigned int olen, unsigned char *in, unsigned int ilen);

diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 49be818dc72b012bf0648d3d9737fc58251d9834..6684ab4841f0ae039f4def7b9df7d0c443c6b476 100644 (file)
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "objects.h"
-#include "comp.h"
+#include <openssl/objects.h>
+#include <openssl/comp.h>
 
 COMP_METHOD *COMP_zlib(void );
 

diff --git a/crypto/comp/comp.h b/crypto/comp/comp.h
index 0b860845280ed776290959a8d2e7ce97285cbf80..7870a1e73656740a5b666adbfdc197609c8e1e85 100644 (file)
--- a/crypto/comp/comp.h
+++ b/crypto/comp/comp.h
@@ -6,7 +6,7 @@
 extern "C" {
 #endif
 
-#include "crypto.h"
+#include <openssl/crypto.h>
 
 typedef struct comp_method_st
        {

diff --git a/crypto/comp/comp_err.c b/crypto/comp/comp_err.c
index 3202068b0ef4607284ad35d90f560cc3f86bf7a2..e67c91d6bdb295fd955b3353ccf8c9e8bfb5167e 100644 (file)
--- a/crypto/comp/comp_err.c
+++ b/crypto/comp/comp_err.c
@@ -56,8 +56,8 @@
  * [including the GNU Public Licence.]
  */
 #include <stdio.h>
-#include "err.h"
-#include "comp.h"
+#include <openssl/err.h>
+#include <openssl/comp.h>
 
 /* BEGIN ERROR CODES */
 #ifndef NO_ERR

diff --git a/crypto/comp/comp_lib.c b/crypto/comp/comp_lib.c
index dec3b1fc778de382958b94796156f67f04cd4bc7..a67ef23bc0fd2abc5dd931d714dd496ea1219741 100644 (file)
--- a/crypto/comp/comp_lib.c
+++ b/crypto/comp/comp_lib.c
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "objects.h"
-#include "comp.h"
+#include <openssl/objects.h>
+#include <openssl/comp.h>
 
 COMP_CTX *COMP_CTX_new(COMP_METHOD *meth)
        {

diff --git a/crypto/conf/Makefile.ssl b/crypto/conf/Makefile.ssl
index 614da0a5c40d9a1fa454ed28eb8131b20c2719d7..3a209b562307cdd21cc2dcdc6a31e49707894965 100644 (file)
--- a/crypto/conf/Makefile.ssl
+++ b/crypto/conf/Makefile.ssl
@@ -48,15 +48,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/conf/cnf_save.c b/crypto/conf/cnf_save.c
index 632d17e48803cd71ff3b1f0153d9ea8359234d12..e907cc224276e4304d23305ab967c9856b649051 100644 (file)
--- a/crypto/conf/cnf_save.c
+++ b/crypto/conf/cnf_save.c
@@ -57,7 +57,7 @@
  */
 
 #include <stdio.h>
-#include "conf.h"
+#include <openssl/conf.h>
 
 void print_conf(CONF_VALUE *cv);
 

diff --git a/crypto/conf/conf.c b/crypto/conf/conf.c
index 532cc3ddbbc84c81ded2982cb723f278ad6bb984..f2387098e64da5d6d865a7259aac170083232daa 100644 (file)
--- a/crypto/conf/conf.c
+++ b/crypto/conf/conf.c
@@ -59,11 +59,11 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "stack.h"
-#include "lhash.h"
-#include "conf.h"
-#include "buffer.h"
-#include "err.h"
+#include <openssl/stack.h>
+#include <openssl/lhash.h>
+#include <openssl/conf.h>
+#include <openssl/buffer.h>
+#include <openssl/err.h>
 
 #include "conf_lcl.h"
 

diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h
index 1446226a160f9f817a89b8f0a0467ca8db22fd96..45efed198fdac252d722255a9feea7b3010b015c 100644 (file)
--- a/crypto/conf/conf.h
+++ b/crypto/conf/conf.h
@@ -63,8 +63,8 @@
 extern "C" {
 #endif
 
-#include "stack.h"
-#include "lhash.h"
+#include <openssl/stack.h>
+#include <openssl/lhash.h>
 
 typedef struct
        {

diff --git a/crypto/conf/conf_err.c b/crypto/conf/conf_err.c
index ec4ab140a6009bbdbb34ee14b91169fd84920fb4..24d722d8010ad838ac275e13dff614b85cd17089 100644 (file)
--- a/crypto/conf/conf_err.c
+++ b/crypto/conf/conf_err.c
@@ -56,8 +56,8 @@
  * [including the GNU Public Licence.]
  */
 #include <stdio.h>
-#include "err.h"
-#include "conf.h"
+#include <openssl/err.h>
+#include <openssl/conf.h>
 
 /* BEGIN ERROR CODES */
 #ifndef NO_ERR

diff --git a/crypto/conf/test.c b/crypto/conf/test.c
index 9df6715d550e1b0de7b69f1b075711da94158c80..9390a48bafe6c5c4346378e2e7bf5cf1738cb02b 100644 (file)
--- a/crypto/conf/test.c
+++ b/crypto/conf/test.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "conf.h"
-#include "err.h"
+#include <openssl/conf.h>
+#include <openssl/err.h>
 
 main()
        {

diff --git a/crypto/cpt_err.c b/crypto/cpt_err.c
index bea3274e3fe328b6dc239ce5a8a254b917d02944..2c064c5113c9a8192502aca923872831ad94f779 100644 (file)
--- a/crypto/cpt_err.c
+++ b/crypto/cpt_err.c
@@ -56,8 +56,8 @@
  * [including the GNU Public Licence.]
  */
 #include <stdio.h>
-#include "err.h"
-#include "crypto.h"
+#include <openssl/err.h>
+#include <openssl/crypto.h>
 
 /* BEGIN ERROR CODES */
 #ifndef NO_ERR

diff --git a/crypto/cryptall.h b/crypto/cryptall.h
index 65a46452a8150ba6ab0bf9494916cd4643c6a27e..0ff375e957f7570b38571fcc52a8edcfd4ddfef5 100644 (file)
--- a/crypto/cryptall.h
+++ b/crypto/cryptall.h
@@ -59,52 +59,52 @@
 #ifndef HEADER_CRYPTOALL_H
 #define HEADER_CRYPTOALL_H
 
-#include "buffer.h"
-#include "stack.h"
-#include "lhash.h"
+#include <openssl/buffer.h>
+#include <openssl/stack.h>
+#include <openssl/lhash.h>
 
-#include "err.h"
+#include <openssl/err.h>
 
 #ifdef NO_MD2
 #include <md2.h>
 #else
-#include "md2.h"
+#include <openssl/md2.h>
 #endif
 #ifdef NO_MD5
 #include <md5.h>
 #else
-#include "md5.h"
+#include <openssl/md5.h>
 #endif
-#include "sha.h"
+#include <openssl/sha.h>
 
 #ifdef NO_DES
 #include <des.h>
 #else
-#include "des.h"
+#include <openssl/des.h>
 #endif
-#include "rc2.h"
-#include "rc4.h"
-#include "idea.h"
+#include <openssl/rc2.h>
+#include <openssl/rc4.h>
+#include <openssl/idea.h>
 
-#include "bn.h"
-#include "dh.h"
-#include "rsa.h"
-#include "dsa.h"
+#include <openssl/bn.h>
+#include <openssl/dh.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 
-#include "rand.h"
-#include "conf.h"
-#include "txt_db.h"
+#include <openssl/rand.h>
+#include <openssl/conf.h>
+#include <openssl/txt_db.h>
 
-#include "err.h"
-#include "evp.h"
+#include <openssl/err.h>
+#include <openssl/evp.h>
 
 #include "meth.h"
-#include "x509.h"
-#include "pkcs7.h"
-#include "pem.h"
-#include "asn1.h"
-#include "objects.h"
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pem.h>
+#include <openssl/asn1.h>
+#include <openssl/objects.h>
 
-#include "crypto.h"
+#include <openssl/crypto.h>
 
 #endif

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 3285813a13d743dff5091aad1525e93623a9a98a..3169b26b32d9bd0381ac026b8937a316a8d427fc 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -59,7 +59,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "cryptlib.h"
-#include "crypto.h"
+#include <openssl/crypto.h>
 #include "date.h"
 
 #if defined(WIN32) || defined(WIN16)

diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
index e4b8f2af2fb3830c536b98b1091980e0252f38b8..8671bea9ff823dba93a638aaae9e77f337409405 100644 (file)
--- a/crypto/cryptlib.h
+++ b/crypto/cryptlib.h
@@ -68,17 +68,17 @@ extern "C" {
 
 /* #ifdef FLAT_INC */
 
-#include "e_os.h"
-#include "crypto.h"
-#include "buffer.h" 
-#include "bio.h" 
-#include "err.h"
+#include <openssl/e_os.h>
+#include <openssl/crypto.h>
+#include <openssl/buffer.h> 
+#include <openssl/bio.h> 
+#include <openssl/err.h>
 
 /*
 #else
 
 #include "../e_os.h"
-#include "crypto.h"
+#include <openssl/crypto.h>
 #include "buffer/buffer.h"
 #include "bio/bio.h"
 #include "err/err.h"

diff --git a/crypto/crypto.c b/crypto/crypto.c
index 7f89c5a608b96f5d19caa9071709f3772376e7d9..2011dc368c14725eceb7a69378f98ce537c787fa 100644 (file)
--- a/crypto/crypto.c
+++ b/crypto/crypto.c
@@ -115,25 +115,25 @@
 #define USE_SOCKETS
 #include "../e_os.h"
 
-#include "buffer.h"
-#include "bio.h"
-#include "stack.h"
-#include "lhash.h"
+#include <openssl/buffer.h>
+#include <openssl/bio.h>
+#include <openssl/stack.h>
+#include <openssl/lhash.h>
 
-#include "err.h"
+#include <openssl/err.h>
 
-#include "bn.h"
-#include "evp.h"
+#include <openssl/bn.h>
+#include <openssl/evp.h>
 
-#include "rand.h"
-#include "conf.h"
-#include "txt_db.h"
+#include <openssl/rand.h>
+#include <openssl/conf.h>
+#include <openssl/txt_db.h>
 
-#include "x509.h"
-#include "pkcs7.h"
-#include "pem.h"
-#include "asn1.h"
-#include "objects.h"
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pem.h>
+#include <openssl/asn1.h>
+#include <openssl/objects.h>
 
 #ifdef CRYPTO_LIB_SUBSET
 #include "cryptlib.c"

diff --git a/crypto/crypto.h b/crypto/crypto.h
index 44d65f5f1b959c0fc9546d8aca8aaf5088a29af3..1f84d062d8a176d0755c786292cb9d5387281e92 100644 (file)
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -63,8 +63,8 @@
 extern "C" {
 #endif
 
-#include "stack.h"
-#include "opensslv.h"
+#include <openssl/stack.h>
+#include <openssl/opensslv.h>
 
 /* Backward compatibility to SSLeay */
 /* This is more to be used to check the correct DLL is being used

diff --git a/crypto/cversion.c b/crypto/cversion.c
index 8d18a95dfc6789230c1677619dc65eb873018a7b..e4e6afa69a273a6e3e56df4160bf1cb2df5d8866 100644 (file)
--- a/crypto/cversion.c
+++ b/crypto/cversion.c
@@ -59,7 +59,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "cryptlib.h"
-#include "crypto.h"
+#include <openssl/crypto.h>
 #include "date.h"
 
 const char *SSLeay_version(int t)

diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl
index 084934793eac0149b315257531867098a919138a..c7d565401278b58606f122b7141104b63c7cf985 100644 (file)
--- a/crypto/des/Makefile.ssl
+++ b/crypto/des/Makefile.ssl
@@ -101,7 +101,7 @@ files:
 links:
        @$(TOP)/util/point.sh Makefile.ssl Makefile
        @$(TOP)/util/point.sh ../../perlasm asm/perlasm
-       @$(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)
 
@@ -110,8 +110,8 @@ install: installs
 installs:
        @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/des/des.c b/crypto/des/des.c
index 7dc3b565baafcb32a8d438c196050f448f82739a..20b27d3a78ab4c33d751953d73690407ed639fcd 100644 (file)
--- a/crypto/des/des.c
+++ b/crypto/des/des.c
@@ -80,7 +80,7 @@
 #if defined(NOCONST)
 #define const
 #endif
-#include "des.h"
+#include <openssl/des.h>
 
 #if defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS)
 #include <string.h>

diff --git a/crypto/des/des.h b/crypto/des/des.h
index 54f18c7091f6139001fa2098b34d7178591725e8..fba3d81c010a1142cf9331b1a20db6de71fbe612 100644 (file)
--- a/crypto/des/des.h
+++ b/crypto/des/des.h
@@ -64,7 +64,7 @@ extern "C" {
 #endif
 
 #include <stdio.h>
-#include "opensslconf.h" /* DES_LONG */
+#include <openssl/opensslconf.h> /* DES_LONG */
 
 typedef unsigned char des_cblock[8];
 typedef unsigned char *des_cblocks; /* Unfortunately there's no way to say that

diff --git a/crypto/des/des_locl.h b/crypto/des/des_locl.h
index f94e9ff5d277eebcb2f242e7c3442e10d133abf7..e1948174415bc96f89c71e1fa35719f61404764d 100644 (file)
--- a/crypto/des/des_locl.h
+++ b/crypto/des/des_locl.h
@@ -70,9 +70,9 @@
 #ifndef MSDOS
 #include <unistd.h>
 #endif
-#include "des.h"
+#include <openssl/des.h>
 
-#include "opensslconf.h"
+#include <openssl/opensslconf.h>
 
 #ifdef MSDOS           /* Visual C++ 2.1 (Windows NT/95) */
 #include <stdlib.h>

diff --git a/crypto/des/des_opts.c b/crypto/des/des_opts.c
index 7ef05c187661a60f244d8bef27dee8eb547febe9..4ae3dae76bce40cc280508d44168ac308a6caaa3 100644 (file)
--- a/crypto/des/des_opts.c
+++ b/crypto/des/des_opts.c
@@ -98,7 +98,7 @@ struct tms {
 #include <sys/param.h>
 #endif
 
-#include "des.h"
+#include <openssl/des.h>
 #include "spr.h"
 
 #define DES_DEFAULT_OPTIONS

diff --git a/crypto/des/destest.c b/crypto/des/destest.c
index 746a284d43680e483aa2a01e60266a2a54f249b2..39fc8123e418f9e57bccb8c89c3ff2f643a509f5 100644 (file)
--- a/crypto/des/destest.c
+++ b/crypto/des/destest.c
@@ -70,7 +70,7 @@
 #include <io.h>
 #endif
 #include <string.h>
-#include "des.h"
+#include <openssl/des.h>
 
 #if defined(PERL5) || defined(__FreeBSD__)
 #define crypt(c,s) (des_crypt((c),(s)))

diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c
index 9de7b1d5c94794d23be385ed67e883a125c9d81f..d664bdeebb9c0b830d8db37cc10262728d046cff 100644 (file)
--- a/crypto/des/ecb_enc.c
+++ b/crypto/des/ecb_enc.c
@@ -58,7 +58,7 @@
 
 #include "des_locl.h"
 #include "spr.h"
-#include "opensslv.h"
+#include <openssl/opensslv.h>
 
 const char *libdes_version="libdes v 3.24 - 20-Apr-1996 - eay";
 const char *DES_version="DES" OPENSSL_VERSION_PTEXT;

diff --git a/crypto/des/rpw.c b/crypto/des/rpw.c
index bf9d35ca33efece2814aedce334e93220fe3d857..e0ba7a2591442fa126efb60767931862f1f34978 100644 (file)
--- a/crypto/des/rpw.c
+++ b/crypto/des/rpw.c
@@ -57,7 +57,7 @@
  */
 
 #include <stdio.h>
-#include "des.h"
+#include <openssl/des.h>
 
 int main(int argc, char *argv[])
        {

diff --git a/crypto/des/speed.c b/crypto/des/speed.c
index 1384c9419ef90efd41b17ff4d0062c70ae7f4520..cfc78ab499593432cddf9d6295a80c98df6e7775 100644 (file)
--- a/crypto/des/speed.c
+++ b/crypto/des/speed.c
@@ -98,7 +98,7 @@ struct tms {
 #include <sys/param.h>
 #endif
 
-#include "des.h"
+#include <openssl/des.h>
 
 /* The following if from times(3) man page.  It may need to be changed */
 #ifndef HZ

diff --git a/crypto/dh/Makefile.ssl b/crypto/dh/Makefile.ssl
index 20ef883a8d57720e4b51460ded46aaf6dd47f290..514d552847f794386f3b5b0f97d673a0415dd7d7 100644 (file)
--- a/crypto/dh/Makefile.ssl
+++ b/crypto/dh/Makefile.ssl
@@ -47,15 +47,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/dh/dh.h b/crypto/dh/dh.h
index 5431725b8da1ba98fea4f4702357d4eb1c09f9ab..dc0df313cab4035f8503549e0621ce38773f5aad 100644 (file)
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -63,7 +63,7 @@
 extern "C" {
 #endif
 
-#include "bn.h"
+#include <openssl/bn.h>
        
 #define DH_FLAG_CACHE_MONT_P   0x01
 

diff --git a/crypto/dh/dh_check.c b/crypto/dh/dh_check.c
index e631f60718299d6766d8809e093e13a3a85b10a1..95ce9cfad012f9e531d298496b8244c6e3f7c705 100644 (file)
--- a/crypto/dh/dh_check.c
+++ b/crypto/dh/dh_check.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bn.h"
-#include "dh.h"
+#include <openssl/bn.h>
+#include <openssl/dh.h>
 
 /* Check that p is a strong prime and
  * if g is 2, 3 or 5, check that is is a suitable generator

diff --git a/crypto/dh/dh_err.c b/crypto/dh/dh_err.c
index 5c1a12941463964dc89ba3e73241b8f459361824..986fe6ce7817d8199a5e3b3f12c0ffe67e0ee840 100644 (file)
--- a/crypto/dh/dh_err.c
+++ b/crypto/dh/dh_err.c
@@ -56,8 +56,8 @@
  * [including the GNU Public Licence.]
  */
 #include <stdio.h>
-#include "err.h"
-#include "dh.h"
+#include <openssl/err.h>
+#include <openssl/dh.h>
 
 /* BEGIN ERROR CODES */
 #ifndef NO_ERR

diff --git a/crypto/dh/dh_gen.c b/crypto/dh/dh_gen.c
index fc577af05dddefb866db05ec8282dd8df59b225d..32237e8b95e8d18d42734c03713dfdaa4a58692e 100644 (file)
--- a/crypto/dh/dh_gen.c
+++ b/crypto/dh/dh_gen.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bn.h"
-#include "dh.h"
+#include <openssl/bn.h>
+#include <openssl/dh.h>
 
 /* We generate DH parameters as follows
  * find a prime q which is prime_len/2 bits long.

diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
index 25cc635e6da723e744559f3d2e4a563ab425b807..cede53bfc17fec445bfab8b7d067900fb36b583d 100644 (file)
--- a/crypto/dh/dh_key.c
+++ b/crypto/dh/dh_key.c
@@ -58,9 +58,9 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bn.h"
-#include "rand.h"
-#include "dh.h"
+#include <openssl/bn.h>
+#include <openssl/rand.h>
+#include <openssl/dh.h>
 
 int DH_generate_key(DH *dh)
        {

diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
index 12b40cd1a40310f9eadda912204850e736492597..61e0720e8a7960bceba032b0b000945004eb44d5 100644 (file)
--- a/crypto/dh/dh_lib.c
+++ b/crypto/dh/dh_lib.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bn.h"
-#include "dh.h"
+#include <openssl/bn.h>
+#include <openssl/dh.h>
 
 const char *DH_version="Diffie-Hellman" OPENSSL_VERSION_PTEXT;
 

diff --git a/crypto/dh/dhtest.c b/crypto/dh/dhtest.c
index 249a2ecc09a5490e6f5165116d5663fd85a184ee..24e361c3d7daa229671fe6e06a25e8a5705401e4 100644 (file)
--- a/crypto/dh/dhtest.c
+++ b/crypto/dh/dhtest.c
@@ -62,10 +62,10 @@
 #ifdef WINDOWS
 #include "../bio/bss_file.c" 
 #endif
-#include "crypto.h"
-#include "bio.h"
-#include "bn.h"
-#include "dh.h"
+#include <openssl/crypto.h>
+#include <openssl/bio.h>
+#include <openssl/bn.h>
+#include <openssl/dh.h>
 
 #ifdef WIN16
 #define MS_CALLBACK    _far _loadds

diff --git a/crypto/dh/p1024.c b/crypto/dh/p1024.c
index 0c50c24cfbac641990bef5b150c15ad43271ff5c..368ceca4eb06b06457ee4e7e695c5bec4107bd40 100644 (file)
--- a/crypto/dh/p1024.c
+++ b/crypto/dh/p1024.c
@@ -57,10 +57,10 @@
  */
 
 #include <stdio.h>
-#include "bn.h"
-#include "asn1.h"
-#include "dh.h"
-#include "pem.h"
+#include <openssl/bn.h>
+#include <openssl/asn1.h>
+#include <openssl/dh.h>
+#include <openssl/pem.h>
 
 unsigned char data[]={0x97,0xF6,0x42,0x61,0xCA,0xB5,0x05,0xDD,
        0x28,0x28,0xE1,0x3F,0x1D,0x68,0xB6,0xD3,

diff --git a/crypto/dh/p192.c b/crypto/dh/p192.c
index 881908169ab05e42bcbad7e0d59575b861910ea0..7bdf40410eb0e7d38ee16d07f6d4b21042405fc8 100644 (file)
--- a/crypto/dh/p192.c
+++ b/crypto/dh/p192.c
@@ -57,10 +57,10 @@
  */
 
 #include <stdio.h>
-#include "bn.h"
-#include "asn1.h"
-#include "dh.h"
-#include "pem.h"
+#include <openssl/bn.h>
+#include <openssl/asn1.h>
+#include <openssl/dh.h>
+#include <openssl/pem.h>
 
 unsigned char data[]={
 0xD4,0xA0,0xBA,0x02,0x50,0xB6,0xFD,0x2E,

diff --git a/crypto/dh/p512.c b/crypto/dh/p512.c
index cc84e8e50e0c0034292893aa255de208c06993d5..a9b6aa83f0344f1c45295862aa47d3ac297b116c 100644 (file)
--- a/crypto/dh/p512.c
+++ b/crypto/dh/p512.c
@@ -57,10 +57,10 @@
  */
 
 #include <stdio.h>
-#include "bn.h"
-#include "asn1.h"
-#include "dh.h"
-#include "pem.h"
+#include <openssl/bn.h>
+#include <openssl/asn1.h>
+#include <openssl/dh.h>
+#include <openssl/pem.h>
 
 unsigned char data[]={
 0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,

diff --git a/crypto/dsa/Makefile.ssl b/crypto/dsa/Makefile.ssl
index 8f9dc77dea1399648f14db489b59b675b620e424..4ee5a9ed3c30824cd29eb03f5c95f5a8a4748b93 100644 (file)
--- a/crypto/dsa/Makefile.ssl
+++ b/crypto/dsa/Makefile.ssl
@@ -47,15 +47,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/dsa/dsa.h b/crypto/dsa/dsa.h
index 4d8aad63cfc3aa307046d144fcc8697c38237450..6ae1783d695488befe2894ef5cded9ecc2cdf7cb 100644 (file)
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -69,7 +69,7 @@
 extern "C" {
 #endif
 
-#include "bn.h"
+#include <openssl/bn.h>
 
 #define DSA_FLAG_CACHE_MONT_P  0x01
 

diff --git a/crypto/dsa/dsa_asn1.c b/crypto/dsa/dsa_asn1.c
index 97c37fb59206dcb3f2e9e70ae4706fac99f0c20f..7523b21654d7bffbe16b3792275b06f462e837fe 100644 (file)
--- a/crypto/dsa/dsa_asn1.c
+++ b/crypto/dsa/dsa_asn1.c
@@ -2,9 +2,9 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "dsa.h"
-#include "asn1.h"
-#include "asn1_mac.h"
+#include <openssl/dsa.h>
+#include <openssl/asn1.h>
+#include <openssl/asn1_mac.h>
 
 DSA_SIG *DSA_SIG_new(void)
 {

diff --git a/crypto/dsa/dsa_err.c b/crypto/dsa/dsa_err.c
index d4cbe1d74bd00f513c67f4624b36d98ba4abd2fc..149a9146c7fe0c2673278dc4dfbb7a122892e3ce 100644 (file)
--- a/crypto/dsa/dsa_err.c
+++ b/crypto/dsa/dsa_err.c
@@ -56,8 +56,8 @@
  * [including the GNU Public Licence.]
  */
 #include <stdio.h>
-#include "err.h"
-#include "dsa.h"
+#include <openssl/err.h>
+#include <openssl/dsa.h>
 
 /* BEGIN ERROR CODES */
 #ifndef NO_ERR

diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index 4f677d5b937e3330046f31db38e1b99175830dec..9ea53d4420b9738109428ce1082634ee2f0a0793 100644 (file)
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -67,10 +67,10 @@
 #include <stdio.h>
 #include <time.h>
 #include "cryptlib.h"
-#include "sha.h"
-#include "bn.h"
-#include "dsa.h"
-#include "rand.h"
+#include <openssl/sha.h>
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/rand.h>
 
 DSA *DSA_generate_parameters(int bits, unsigned char *seed_in, int seed_len,
             int *counter_ret, unsigned long *h_ret, void (*callback)(),

diff --git a/crypto/dsa/dsa_key.c b/crypto/dsa/dsa_key.c
index 21ed0f65e07e82838555d02fee934598e7c68aa3..e974861c5c638bfe0caf1e78d1efebe7d8052b68 100644 (file)
--- a/crypto/dsa/dsa_key.c
+++ b/crypto/dsa/dsa_key.c
@@ -59,10 +59,10 @@
 #include <stdio.h>
 #include <time.h>
 #include "cryptlib.h"
-#include "sha.h"
-#include "bn.h"
-#include "dsa.h"
-#include "rand.h"
+#include <openssl/sha.h>
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/rand.h>
 
 int DSA_generate_key(DSA *dsa)
        {

diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index 1bd89ae4c3895e5434a5c11220f35ffc2f802967..8923fb45f4340e0d6ea10b238ff3124fd916aa93 100644 (file)
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -60,9 +60,9 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bn.h"
-#include "dsa.h"
-#include "asn1.h"
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/asn1.h>
 
 const char *DSA_version="DSA" OPENSSL_VERSION_PTEXT;
 

diff --git a/crypto/dsa/dsa_sign.c b/crypto/dsa/dsa_sign.c
index f823e5dee323e1a17c1962f2bc91c64b0ce8b5de..709d93ee73020f20e21b14927e978cf001785f43 100644 (file)
--- a/crypto/dsa/dsa_sign.c
+++ b/crypto/dsa/dsa_sign.c
@@ -60,10 +60,10 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bn.h"
-#include "dsa.h"
-#include "rand.h"
-#include "asn1.h"
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/rand.h>
+#include <openssl/asn1.h>
 
 DSA_SIG * DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
        {

diff --git a/crypto/dsa/dsa_vrf.c b/crypto/dsa/dsa_vrf.c
index ca51ad2e5c5f30bbe2398bb818c8439b0b685e27..ff552208aa23e638fbe2a0802849c2745f7e5558 100644 (file)
--- a/crypto/dsa/dsa_vrf.c
+++ b/crypto/dsa/dsa_vrf.c
@@ -60,11 +60,11 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bn.h"
-#include "dsa.h"
-#include "rand.h"
-#include "asn1.h"
-#include "asn1_mac.h"
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/rand.h>
+#include <openssl/asn1.h>
+#include <openssl/asn1_mac.h>
 
 int DSA_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
                  DSA *dsa)

diff --git a/crypto/dsa/dsagen.c b/crypto/dsa/dsagen.c
index ce08d10353ef9f50ff7990873eec44c4bc140ef8..a0b097664086384f9d67736efde77aa1a53985e2 100644 (file)
--- a/crypto/dsa/dsagen.c
+++ b/crypto/dsa/dsagen.c
@@ -57,7 +57,7 @@
  */
 
 #include <stdio.h>
-#include "dsa.h"
+#include <openssl/dsa.h>
 
 #define TEST
 #define GENUINE_DSA

diff --git a/crypto/dsa/dsatest.c b/crypto/dsa/dsatest.c
index 77b8cd800faa0a756bc012339b203b3193d46095..1613f5350eba58addb07bf451d8a99bb143d12cf 100644 (file)
--- a/crypto/dsa/dsatest.c
+++ b/crypto/dsa/dsatest.c
@@ -61,11 +61,11 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "crypto.h"
-#include "rand.h"
-#include "bio.h"
-#include "err.h"
-#include "dsa.h"
+#include <openssl/crypto.h>
+#include <openssl/rand.h>
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/dsa.h>
 #ifdef WINDOWS
 #include "../bio/bss_file.c"
 #endif

diff --git a/crypto/err/Makefile.ssl b/crypto/err/Makefile.ssl
index 03fd6af4aa7ee95e8f3db40d800253e66ae864ef..de867c9b602afc6e11fb325e6e5bf58d1aea2ec4 100644 (file)
--- a/crypto/err/Makefile.ssl
+++ b/crypto/err/Makefile.ssl
@@ -45,15 +45,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/err/err.c b/crypto/err/err.c
index db78aa787935aa13adf9bbfab0233b0fcc23714f..cf31f4f51a7d309150ed14e708b08a1319a646d7 100644 (file)
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -57,12 +57,12 @@
  */
 
 #include <stdio.h>
-#include "lhash.h"
-#include "crypto.h"
+#include <openssl/lhash.h>
+#include <openssl/crypto.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "err.h"
-#include "crypto.h"
+#include <openssl/buffer.h>
+#include <openssl/err.h>
+#include <openssl/crypto.h>
 
 
 static LHASH *error_hash=NULL;

diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index 2479d6b41dac6b2505142e08caf86718a5d6a40f..ad820227d24602fc99fcd23322725706c923c855 100644 (file)
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -57,30 +57,30 @@
  */
 
 #include <stdio.h>
-#include "asn1.h"
-#include "bn.h"
-#include "buffer.h"
-#include "bio.h"
+#include <openssl/asn1.h>
+#include <openssl/bn.h>
+#include <openssl/buffer.h>
+#include <openssl/bio.h>
 #ifndef NO_RSA
-#include "rsa.h"
+#include <openssl/rsa.h>
 #endif
 #ifdef RSAref
-#include "rsaref.h"
+#include <openssl/rsaref.h>
 #endif
 #ifndef NO_DH
-#include "dh.h"
+#include <openssl/dh.h>
 #endif
 #ifndef NO_DSA
-#include "dsa.h"
+#include <openssl/dsa.h>
 #endif
-#include "evp.h"
-#include "objects.h"
-#include "pem2.h"
-#include "x509.h"
-#include "x509v3.h"
-#include "conf.h"
-#include "pkcs12.h"
-#include "err.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/pem2.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/conf.h>
+#include <openssl/pkcs12.h>
+#include <openssl/err.h>
 
 void ERR_load_crypto_strings(void)
        {

diff --git a/crypto/err/err_prn.c b/crypto/err/err_prn.c
index c72713b6c496977794036d0996941d7ba78601f4..0999ff214bf6902f89b80f481b05bb95c0cddf04 100644 (file)
--- a/crypto/err/err_prn.c
+++ b/crypto/err/err_prn.c
@@ -57,12 +57,12 @@
  */
 
 #include <stdio.h>
-#include "lhash.h"
-#include "crypto.h"
+#include <openssl/lhash.h>
+#include <openssl/crypto.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "err.h"
-#include "crypto.h"
+#include <openssl/buffer.h>
+#include <openssl/err.h>
+#include <openssl/crypto.h>
 
 #ifndef NO_FP_API
 void ERR_print_errors_fp(FILE *fp)

diff --git a/crypto/evp/Makefile.ssl b/crypto/evp/Makefile.ssl
index 039624514589e870793c9eeda27156be9d4e37ea..a5ece99e9e9557184e9464a8080821b380dc0a9e 100644 (file)
--- a/crypto/evp/Makefile.ssl
+++ b/crypto/evp/Makefile.ssl
@@ -74,15 +74,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/evp/bio_b64.c b/crypto/evp/bio_b64.c
index a68006420070522421356e4b6129908d4301407c..f9d434b2997f9dae88abd830c19e173a8564a4e3 100644 (file)
--- a/crypto/evp/bio_b64.c
+++ b/crypto/evp/bio_b64.c
@@ -59,8 +59,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "evp.h"
+#include <openssl/buffer.h>
+#include <openssl/evp.h>
 
 #ifndef NOPROTO
 static int b64_write(BIO *h,char *buf,int num);

diff --git a/crypto/evp/bio_enc.c b/crypto/evp/bio_enc.c
index d83e1fd13729a298e65b3bdd534384b9bb407cc7..9aaba043c9263db6a8c50c30fb0dddc82f7dc893 100644 (file)
--- a/crypto/evp/bio_enc.c
+++ b/crypto/evp/bio_enc.c
@@ -59,8 +59,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "evp.h"
+#include <openssl/buffer.h>
+#include <openssl/evp.h>
 
 #ifndef NOPROTO
 static int enc_write(BIO *h,char *buf,int num);

diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c
index 78c4c1f4ed287fc4ea4cd9f14a5ced1627a18623..05f258523e7e1d7de8e818bfd9d63d0f45f4cb0f 100644 (file)
--- a/crypto/evp/bio_md.c
+++ b/crypto/evp/bio_md.c
@@ -59,8 +59,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "evp.h"
+#include <openssl/buffer.h>
+#include <openssl/evp.h>
 
 /* BIO_put and BIO_get both add to the digest,
  * BIO_gets returns the digest */

diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c
index 151a95c3c49cbd40e7b547d41eff767467b288e1..328bbd6c22ea0a16452c2d2649f5438e717f8bae 100644 (file)
--- a/crypto/evp/bio_ok.c
+++ b/crypto/evp/bio_ok.c
@@ -120,10 +120,10 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "bio.h"
-#include "evp.h"
-#include "rand.h"
+#include <openssl/buffer.h>
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/rand.h>
 
 #ifndef NOPROTO
 static int ok_write(BIO *h,char *buf,int num);

diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
index edaeda85985830ea4da320c654b94f40d1a36009..b48563e3c06be46a99283cec242eae3b174774a3 100644 (file)
--- a/crypto/evp/c_all.c
+++ b/crypto/evp/c_all.c
@@ -58,9 +58,9 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "pkcs12.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/pkcs12.h>
+#include <openssl/objects.h>
 
 void SSLeay_add_all_algorithms(void)
        {

diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index c2c603ea63d9a06f86c9365b652523faa93e3ddf..89575b5dacd8fbada464693853d6e3fb59b16c33 100644 (file)
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "objects.h"
-#include "evp.h"
+#include <openssl/objects.h>
+#include <openssl/evp.h>
 
 void EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type)
        {

diff --git a/crypto/evp/e_cbc_3d.c b/crypto/evp/e_cbc_3d.c
index f68f02b1224f28abffee6ea30edb12ac45f4ba29..2e0f80b8873d63628b1632e92fc65a906492b2e2 100644 (file)
--- a/crypto/evp/e_cbc_3d.c
+++ b/crypto/evp/e_cbc_3d.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void des_cbc_ede_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_cbc_bf.c b/crypto/evp/e_cbc_bf.c
index 1125ca5270ba89f4b3df8e588321d834b91b5a2a..86f997ca4c7d51df758d93fd391d4f3d99a7d1a3 100644 (file)
--- a/crypto/evp/e_cbc_bf.c
+++ b/crypto/evp/e_cbc_bf.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void bf_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_cbc_c.c b/crypto/evp/e_cbc_c.c
index 8f0eb5aed7a67b24b4d135190b28d1004ff212e8..48da3ef57c19c4a56e56d1652e7d547d70885dbd 100644 (file)
--- a/crypto/evp/e_cbc_c.c
+++ b/crypto/evp/e_cbc_c.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void cast_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_cbc_d.c b/crypto/evp/e_cbc_d.c
index eb7a24f3cf67349a70baa6ca96a0529bde4487e3..e97368142b1216d3427fe76abd5f4702a4a5e3b5 100644 (file)
--- a/crypto/evp/e_cbc_d.c
+++ b/crypto/evp/e_cbc_d.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void des_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_cbc_i.c b/crypto/evp/e_cbc_i.c
index be7461cda187bf7cb74d1cbceaabbe97ffe5ad74..d5210ca064ce9e9fc1341773cc300122f3edef05 100644 (file)
--- a/crypto/evp/e_cbc_i.c
+++ b/crypto/evp/e_cbc_i.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void idea_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_cbc_r2.c b/crypto/evp/e_cbc_r2.c
index b30ff665924dcd722e38662a0ce98f94e90a47fe..695b211518506b60da4367b69e8c2cd40f588f4c 100644 (file)
--- a/crypto/evp/e_cbc_r2.c
+++ b/crypto/evp/e_cbc_r2.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void rc2_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_cbc_r5.c b/crypto/evp/e_cbc_r5.c
index 93aa22e4577ce02e2205be0257b57bf691c4251f..b9418b551e894dd510e3300319ec7e6a05e6421c 100644 (file)
--- a/crypto/evp/e_cbc_r5.c
+++ b/crypto/evp/e_cbc_r5.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void r_32_12_16_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_cfb_3d.c b/crypto/evp/e_cfb_3d.c
index e1fc9751e467151cc7cf792f34c6ed55c4870591..a0321fa1330923ff5706475211713ce354a36a2f 100644 (file)
--- a/crypto/evp/e_cfb_3d.c
+++ b/crypto/evp/e_cfb_3d.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void des_ede_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_cfb_bf.c b/crypto/evp/e_cfb_bf.c
index ca13c8b8399584e78c7dd41daf70d8f1af5df3d0..1d7e8bbd7e38f568144a177e2fa381ec5302c803 100644 (file)
--- a/crypto/evp/e_cfb_bf.c
+++ b/crypto/evp/e_cfb_bf.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void bf_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_cfb_c.c b/crypto/evp/e_cfb_c.c
index 3bfdeba403cf42ec32556fb2cf8dd85acaa82a66..0e77e69260c476e2b848b0b1a0dc7295e12542f2 100644 (file)
--- a/crypto/evp/e_cfb_c.c
+++ b/crypto/evp/e_cfb_c.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void cast_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_cfb_d.c b/crypto/evp/e_cfb_d.c
index 08fad964a44086c34d8fc3b54c248747fefca0d0..863edca3f2a8c26ce9c0db2abefec4c6a7049de4 100644 (file)
--- a/crypto/evp/e_cfb_d.c
+++ b/crypto/evp/e_cfb_d.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void des_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_cfb_i.c b/crypto/evp/e_cfb_i.c
index 85e791fafe9a282037d2aa4cb28ad0ca04007e2d..7d9e029adda311ea27121794257f71719b68f698 100644 (file)
--- a/crypto/evp/e_cfb_i.c
+++ b/crypto/evp/e_cfb_i.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void idea_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_cfb_r2.c b/crypto/evp/e_cfb_r2.c
index 78b9f4c147dd0fa074507a86045a6b1954fd9d8d..68c4eba96913e0761972266c2abeb73d78517967 100644 (file)
--- a/crypto/evp/e_cfb_r2.c
+++ b/crypto/evp/e_cfb_r2.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void rc2_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_cfb_r5.c b/crypto/evp/e_cfb_r5.c
index 6031ffc769e24a797dc74938f301827e9f9db2b5..5eb54ba0a8ef3ba3145484bfc490e383f7dab078 100644 (file)
--- a/crypto/evp/e_cfb_r5.c
+++ b/crypto/evp/e_cfb_r5.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void rc5_32_12_16_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_dsa.c b/crypto/evp/e_dsa.c
index 6715c3e95e89466f6bb10b4d174e5bb9590c7fed..b96f2738b3eed0900c0681cd1936239118789512 100644 (file)
--- a/crypto/evp/e_dsa.c
+++ b/crypto/evp/e_dsa.c
@@ -58,9 +58,9 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
 
 static EVP_PKEY_METHOD dss_method=
        {

diff --git a/crypto/evp/e_ecb_3d.c b/crypto/evp/e_ecb_3d.c
index bb4e1b3831e373cbde19071696c38c2fd99cd3f5..93dc8874a403c8c6daab804be5bd698de0582f6a 100644 (file)
--- a/crypto/evp/e_ecb_3d.c
+++ b/crypto/evp/e_ecb_3d.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void des_ede_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_ecb_bf.c b/crypto/evp/e_ecb_bf.c
index 09c8a8ba4573f2defd065c9758304952e56c5ccd..e6d31898ea39403021705de5f872d5e4e2bfbc6f 100644 (file)
--- a/crypto/evp/e_ecb_bf.c
+++ b/crypto/evp/e_ecb_bf.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void bf_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_ecb_c.c b/crypto/evp/e_ecb_c.c
index bd408ce5354d9bbb3a25cba79f69fee22a5f3245..f45b7e08682a97e8dd4e7c5f064c134d65e817f1 100644 (file)
--- a/crypto/evp/e_ecb_c.c
+++ b/crypto/evp/e_ecb_c.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void cast_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_ecb_d.c b/crypto/evp/e_ecb_d.c
index 930bad5c8a29546fe69c29bd41e628f2d67fd479..a9edc530d0296e6fa24c65d687c8114f658ae4d3 100644 (file)
--- a/crypto/evp/e_ecb_d.c
+++ b/crypto/evp/e_ecb_d.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void des_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_ecb_i.c b/crypto/evp/e_ecb_i.c
index 28934917e163206002bfcca774f18d7924f15526..a9948ce49f8a3c41c8b8b9679146c60b1302f6f3 100644 (file)
--- a/crypto/evp/e_ecb_i.c
+++ b/crypto/evp/e_ecb_i.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void idea_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_ecb_r2.c b/crypto/evp/e_ecb_r2.c
index f052b181d089c53334e0a4f768d6795780639346..1c7a396e5d129dc1246e9a084882c871b2757e49 100644 (file)
--- a/crypto/evp/e_ecb_r2.c
+++ b/crypto/evp/e_ecb_r2.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void rc2_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_ecb_r5.c b/crypto/evp/e_ecb_r5.c
index 2c3203d438e9ca0f9ff1ec5844d12ad8508af511..decd79f44b9d81f921a5c5a1dabf60d37945c303 100644 (file)
--- a/crypto/evp/e_ecb_r5.c
+++ b/crypto/evp/e_ecb_r5.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void rc5_32_12_16_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c
index 374b01c88bf15b9f5e514fe86549926ea5eb23b7..db31fb9f08ad6663a2a489d3144527fdcae5383e 100644 (file)
--- a/crypto/evp/e_null.c
+++ b/crypto/evp/e_null.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void null_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_ofb_3d.c b/crypto/evp/e_ofb_3d.c
index 8d42f16719e674f291d72aaf7d7200fec6d52ede..84b478dafd3ad17fca75c9255efebcc1809150d8 100644 (file)
--- a/crypto/evp/e_ofb_3d.c
+++ b/crypto/evp/e_ofb_3d.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void des_ede_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_ofb_bf.c b/crypto/evp/e_ofb_bf.c
index b1753e60cdebf563ac1b426b2e55ea8bd1d045aa..87f117778e2fdfa57f393981fa7d79e37c2e485a 100644 (file)
--- a/crypto/evp/e_ofb_bf.c
+++ b/crypto/evp/e_ofb_bf.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void bf_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_ofb_c.c b/crypto/evp/e_ofb_c.c
index fb7b501fb6dc3611a9b7b556d69e7b0aafaa7c61..120e9923922677b3ae240b1535031933429cc1b3 100644 (file)
--- a/crypto/evp/e_ofb_c.c
+++ b/crypto/evp/e_ofb_c.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void cast_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_ofb_d.c b/crypto/evp/e_ofb_d.c
index ae0c793e59791335fc6456878c617898357b9208..abb832e085ebc82f8a5d85b2a0b1019739d7f604 100644 (file)
--- a/crypto/evp/e_ofb_d.c
+++ b/crypto/evp/e_ofb_d.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void des_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_ofb_i.c b/crypto/evp/e_ofb_i.c
index 7d68666189ff6590ec3a8875adf134395c59ec91..0af2b9e35f47994ae914b0a7ad8de8680f29fd8b 100644 (file)
--- a/crypto/evp/e_ofb_i.c
+++ b/crypto/evp/e_ofb_i.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void idea_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_ofb_r2.c b/crypto/evp/e_ofb_r2.c
index 73590a296e946c69c32aa8050d5604942e69c853..09821fcf0dca9d586eefbd5fc6bc18e2ddd63343 100644 (file)
--- a/crypto/evp/e_ofb_r2.c
+++ b/crypto/evp/e_ofb_r2.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void rc2_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_ofb_r5.c b/crypto/evp/e_ofb_r5.c
index 8cf021988cfec474e04a8111a9668003168d6660..324065d85009cb806a53ee1e704f1023caf63ad7 100644 (file)
--- a/crypto/evp/e_ofb_r5.c
+++ b/crypto/evp/e_ofb_r5.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void rc5_32_12_16_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_rc4.c b/crypto/evp/e_rc4.c
index 1552379a49a84b6d56ee2b073c7f1d49c20c06e1..2e96bffdf8eb5a4d06cef01fa6650d395e731a10 100644 (file)
--- a/crypto/evp/e_rc4.c
+++ b/crypto/evp/e_rc4.c
@@ -60,8 +60,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void rc4_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/e_xcbc_d.c b/crypto/evp/e_xcbc_d.c
index e697db73e705936422e4455b0cf3e998e3f5b6d0..001a77f1d5d7e0e1631b86df4101ed51aedd5b03 100644 (file)
--- a/crypto/evp/e_xcbc_d.c
+++ b/crypto/evp/e_xcbc_d.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 #ifndef NOPROTO
 static void desx_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,

diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c
index 0fd73f745a59880effaf63762c475e8019e047c9..20d6ec6dd00d936435891aac7a0a361580890da3 100644 (file)
--- a/crypto/evp/encode.c
+++ b/crypto/evp/encode.c
@@ -58,7 +58,7 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
+#include <openssl/evp.h>
 
 #define conv_bin2ascii(a)      (data_bin2ascii[(a)&0x3f])
 #define conv_ascii2bin(a)      (data_ascii2bin[(a)&0x7f])

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index b8d645e129e742baf103b7c3a3db9ad45ed94312..bf320a6b3ff7cd3e194ec60d98adf06a6abea00d 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -64,40 +64,40 @@ extern "C" {
 #endif
 
 #ifndef NO_MD2
-#include "md2.h"
+#include <openssl/md2.h>
 #endif
 #ifndef NO_MD5
-#include "md5.h"
+#include <openssl/md5.h>
 #endif
 #if !defined(NO_SHA) || !defined(NO_SHA1)
-#include "sha.h"
+#include <openssl/sha.h>
 #endif
 #ifndef NO_RMD160
-#include "ripemd.h"
+#include <openssl/ripemd.h>
 #endif
 #ifndef NO_DES
-#include "des.h"
+#include <openssl/des.h>
 #endif
 #ifndef NO_RC4
-#include "rc4.h"
+#include <openssl/rc4.h>
 #endif
 #ifndef NO_RC2
-#include "rc2.h"
+#include <openssl/rc2.h>
 #endif
 #ifndef NO_RC5
-#include "rc5.h"
+#include <openssl/rc5.h>
 #endif
 #ifndef NO_BLOWFISH
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 #endif
 #ifndef NO_CAST
-#include "cast.h"
+#include <openssl/cast.h>
 #endif
 #ifndef NO_IDEA
-#include "idea.h"
+#include <openssl/idea.h>
 #endif
 #ifndef NO_MDC2
-#include "mdc2.h"
+#include <openssl/mdc2.h>
 #endif
 
 #define EVP_RC2_KEY_SIZE               16
@@ -110,24 +110,24 @@ extern "C" {
 #define EVP_MAX_IV_LENGTH              8
 
 #ifndef NO_RSA
-#include "rsa.h"
+#include <openssl/rsa.h>
 #else
 #define RSA    long
 #endif
 
 #ifndef NO_DSA
-#include "dsa.h"
+#include <openssl/dsa.h>
 #else
 #define DSA    long
 #endif
 
 #ifndef NO_DH
-#include "dh.h"
+#include <openssl/dh.h>
 #else
 #define DH     long
 #endif
 
-#include "objects.h"
+#include <openssl/objects.h>
 
 #define EVP_PK_RSA     0x0001
 #define EVP_PK_DSA     0x0002

diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index cc7a38120f5e9648c0fbb9daad963a1522b72013..5299a65b6af396476ff979c02bf7250282e75ffd 100644 (file)
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -58,7 +58,7 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
+#include <openssl/evp.h>
 
 const char *EVP_version="EVP" OPENSSL_VERSION_PTEXT;
 

diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c
index 04a60881c34cba5f612e9a58e607571739bd18d8..d0d3d7251eafd9fe4b067d2c1b661792b7c3966e 100644 (file)
--- a/crypto/evp/evp_err.c
+++ b/crypto/evp/evp_err.c
@@ -56,8 +56,8 @@
  * [including the GNU Public Licence.]
  */
 #include <stdio.h>
-#include "err.h"
-#include "evp.h"
+#include <openssl/err.h>
+#include <openssl/evp.h>
 
 /* BEGIN ERROR CODES */
 #ifndef NO_ERR

diff --git a/crypto/evp/evp_key.c b/crypto/evp/evp_key.c
index fd3a3d12a8ad0ac224ac471b4c13d728bf567ae2..28398bcba46ba1c912b7ff4b3017535a64b595cf 100644 (file)
--- a/crypto/evp/evp_key.c
+++ b/crypto/evp/evp_key.c
@@ -58,9 +58,9 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "x509.h"
-#include "objects.h"
-#include "evp.h"
+#include <openssl/x509.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
 
 /* should be init to zeros. */
 static char prompt_string[80];

diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index 22ae261c8059cbfa4fe94a4ad1d28998648ec8ea..6b677fdf6f266615a9afc9cb336797a85c8d364f 100644 (file)
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
 int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
        {

diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c
index ee4f21fb9de2fec5df138e8db034d3be1ca2eb5d..02ae151cf47c5a86c5619a5e5c40c703116a8c39 100644 (file)
--- a/crypto/evp/evp_pbe.c
+++ b/crypto/evp/evp_pbe.c
@@ -57,8 +57,8 @@
  */
 
 #include <stdio.h>
-#include "evp.h"
-#include "x509.h"
+#include <openssl/evp.h>
+#include <openssl/x509.h>
 #include "cryptlib.h"
 
 /* Password based encryption (PBE) functions */

diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c
index 7ca816823f84982fdaeddc22d84f35439d6928bb..8bea61ebbd2e409139ac24d0e7acdffe0e8b30ea 100644 (file)
--- a/crypto/evp/evp_pkey.c
+++ b/crypto/evp/evp_pkey.c
@@ -59,8 +59,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "cryptlib.h"
-#include "x509.h"
-#include "rand.h"
+#include <openssl/x509.h>
+#include <openssl/rand.h>
 
 /* Extract a private key from a PKCS8 structure */
 

diff --git a/crypto/evp/m_dss.c b/crypto/evp/m_dss.c
index 80b4eca1361dc017c9001942271e6fbfdec9435d..356b936a1c9c1815e3cb97afb710631b7aef811f 100644 (file)
--- a/crypto/evp/m_dss.c
+++ b/crypto/evp/m_dss.c
@@ -58,9 +58,9 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
 
 static EVP_MD dsa_md=
        {

diff --git a/crypto/evp/m_dss1.c b/crypto/evp/m_dss1.c
index 2af70fdb604667502cc1452e765858df2b55a513..4315086abe4d661294cc76abf8150d2bc18fe6ec 100644 (file)
--- a/crypto/evp/m_dss1.c
+++ b/crypto/evp/m_dss1.c
@@ -58,9 +58,9 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"