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

Submitted by:
Reviewed by:
PR:

64 files changed, 170 insertions, 170 deletions

diff --git a/crypto/evp/Makefile.ssl b/crypto/evp/Makefile.ssl
index 0396245145..a5ece99e9e 100644
--- 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 a680064200..f9d434b299 100644
--- 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 d83e1fd137..9aaba043c9 100644
--- 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 78c4c1f4ed..05f258523e 100644
--- 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 151a95c3c4..328bbd6c22 100644
--- 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 edaeda8598..b48563e3c0 100644
--- 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 c2c603ea63..89575b5dac 100644
--- 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 f68f02b122..2e0f80b887 100644
--- 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 1125ca5270..86f997ca4c 100644
--- 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 8f0eb5aed7..48da3ef57c 100644
--- 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 eb7a24f3cf..e97368142b 100644
--- 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 be7461cda1..d5210ca064 100644
--- 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 b30ff66592..695b211518 100644
--- 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 93aa22e457..b9418b551e 100644
--- 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 e1fc9751e4..a0321fa133 100644
--- 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 ca13c8b839..1d7e8bbd7e 100644
--- 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 3bfdeba403..0e77e69260 100644
--- 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 08fad964a4..863edca3f2 100644
--- 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 85e791fafe..7d9e029add 100644
--- 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 78b9f4c147..68c4eba969 100644
--- 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 6031ffc769..5eb54ba0a8 100644
--- 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 6715c3e95e..b96f2738b3 100644
--- 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 bb4e1b3831..93dc8874a4 100644
--- 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 09c8a8ba45..e6d31898ea 100644
--- 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 bd408ce535..f45b7e0868 100644
--- 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 930bad5c8a..a9edc530d0 100644
--- 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 28934917e1..a9948ce49f 100644
--- 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 f052b181d0..1c7a396e5d 100644
--- 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 2c3203d438..decd79f44b 100644
--- 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 374b01c88b..db31fb9f08 100644
--- 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 8d42f16719..84b478dafd 100644
--- 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 b1753e60cd..87f117778e 100644
--- 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/