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

Submitted by:
Reviewed by:
PR:

9 files changed, 12 insertions, 12 deletions

diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl
index 084934793e..c7d5654012 100644
--- 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 7dc3b565ba..20b27d3a78 100644
--- 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 54f18c7091..fba3d81c01 100644
--- 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 f94e9ff5d2..e194817441 100644
--- 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 7ef05c1876..4ae3dae76b 100644
--- 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 746a284d43..39fc8123e4 100644
--- 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 9de7b1d5c9..d664bdeebb 100644
--- 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 bf9d35ca33..e0ba7a2591 100644
--- 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 1384c9419e..cfc78ab499 100644
--- 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