From ec577822f95a8bca0023c5c77cef1a4916822d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bodo=20M=C3=B6ller?= Date: Fri, 23 Apr 1999 22:13:45 +0000 Subject: Change #include filenames from to . Submitted by: Reviewed by: PR: --- ssl/Makefile.ssl | 6 +++--- ssl/bio_ssl.c | 8 ++++---- ssl/s23_clnt.c | 8 ++++---- ssl/s23_lib.c | 2 +- ssl/s23_meth.c | 2 +- ssl/s23_pkt.c | 4 ++-- ssl/s23_srvr.c | 8 ++++---- ssl/s2_clnt.c | 8 ++++---- ssl/s2_lib.c | 4 ++-- ssl/s2_meth.c | 2 +- ssl/s2_srvr.c | 8 ++++---- ssl/s3_both.c | 10 +++++----- ssl/s3_clnt.c | 8 ++++---- ssl/s3_enc.c | 2 +- ssl/s3_lib.c | 2 +- ssl/s3_meth.c | 2 +- ssl/s3_pkt.c | 4 ++-- ssl/s3_srvr.c | 10 +++++----- ssl/ssl.c | 32 ++++++++++++++++---------------- ssl/ssl.h | 20 ++++++++++---------- ssl/ssl3.h | 2 +- ssl/ssl_algs.c | 4 ++-- ssl/ssl_asn1.c | 4 ++-- ssl/ssl_cert.c | 6 +++--- ssl/ssl_ciph.c | 4 ++-- ssl/ssl_err.c | 4 ++-- ssl/ssl_err2.c | 4 ++-- ssl/ssl_lib.c | 4 ++-- ssl/ssl_locl.h | 22 +++++++++++----------- ssl/ssl_rsa.c | 10 +++++----- ssl/ssl_sess.c | 4 ++-- ssl/ssl_task.c | 8 ++++---- ssl/ssl_txt.c | 2 +- ssl/ssltest.c | 12 ++++++------ ssl/t1_clnt.c | 8 ++++---- ssl/t1_enc.c | 6 +++--- ssl/t1_lib.c | 2 +- ssl/t1_meth.c | 2 +- ssl/t1_srvr.c | 10 +++++----- ssl/tls1.h | 2 +- 40 files changed, 135 insertions(+), 135 deletions(-) (limited to 'ssl') diff --git a/ssl/Makefile.ssl b/ssl/Makefile.ssl index 882b6ed8bf..5eb6bdc3a3 100644 --- a/ssl/Makefile.ssl +++ b/ssl/Makefile.ssl @@ -63,15 +63,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/ssl/bio_ssl.c b/ssl/bio_ssl.c index ed08327228..689f3a4fd4 100644 --- a/ssl/bio_ssl.c +++ b/ssl/bio_ssl.c @@ -60,10 +60,10 @@ #include #include #include -#include "crypto.h" -#include "bio.h" -#include "err.h" -#include "ssl.h" +#include +#include +#include +#include #ifndef NOPROTO static int ssl_write(BIO *h,char *buf,int num); diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c index c7f85a621f..5cbd99d56e 100644 --- a/ssl/s23_clnt.c +++ b/ssl/s23_clnt.c @@ -57,10 +57,10 @@ */ #include -#include "buffer.h" -#include "rand.h" -#include "objects.h" -#include "evp.h" +#include +#include +#include +#include #include "ssl_locl.h" #define BREAK break diff --git a/ssl/s23_lib.c b/ssl/s23_lib.c index c4064726fb..80b21404ec 100644 --- a/ssl/s23_lib.c +++ b/ssl/s23_lib.c @@ -57,7 +57,7 @@ */ #include -#include "objects.h" +#include #include "ssl_locl.h" #ifndef NOPROTO diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c index f1f81325be..fc9eae21a5 100644 --- a/ssl/s23_meth.c +++ b/ssl/s23_meth.c @@ -57,7 +57,7 @@ */ #include -#include "objects.h" +#include #include "ssl_locl.h" #ifndef NOPROTO diff --git a/ssl/s23_pkt.c b/ssl/s23_pkt.c index 64acf2ce7d..8370ea508c 100644 --- a/ssl/s23_pkt.c +++ b/ssl/s23_pkt.c @@ -59,8 +59,8 @@ #include #include #define USE_SOCKETS -#include "evp.h" -#include "buffer.h" +#include +#include #include "ssl_locl.h" int ssl23_write_bytes(SSL *s) diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c index f626c9cb06..e5b127feff 100644 --- a/ssl/s23_srvr.c +++ b/ssl/s23_srvr.c @@ -57,10 +57,10 @@ */ #include -#include "buffer.h" -#include "rand.h" -#include "objects.h" -#include "evp.h" +#include +#include +#include +#include #include "ssl_locl.h" #define BREAK break diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c index 3a79fd7412..049ec6c8e1 100644 --- a/ssl/s2_clnt.c +++ b/ssl/s2_clnt.c @@ -57,11 +57,11 @@ */ #include -#include "rand.h" -#include "buffer.h" -#include "objects.h" +#include +#include +#include #include "ssl_locl.h" -#include "evp.h" +#include #ifndef NOPROTO static SSL_METHOD *ssl2_get_client_method(int ver); diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c index b05808700a..3551fb9e8b 100644 --- a/ssl/s2_lib.c +++ b/ssl/s2_lib.c @@ -57,8 +57,8 @@ */ #include -#include "rsa.h" -#include "objects.h" +#include +#include #include "ssl_locl.h" #ifndef NOPROTO diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c index 96ac159ce4..d1940388ed 100644 --- a/ssl/s2_meth.c +++ b/ssl/s2_meth.c @@ -57,7 +57,7 @@ */ #include -#include "objects.h" +#include #include "ssl_locl.h" #ifndef NOPROTO diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c index d472d5d5af..5271546dfb 100644 --- a/ssl/s2_srvr.c +++ b/ssl/s2_srvr.c @@ -57,11 +57,11 @@ */ #include -#include "bio.h" -#include "rand.h" -#include "objects.h" +#include +#include +#include #include "ssl_locl.h" -#include "evp.h" +#include #ifndef NOPROTO static SSL_METHOD *ssl2_get_server_method(int ver); diff --git a/ssl/s3_both.c b/ssl/s3_both.c index f4478a9155..fdffe75249 100644 --- a/ssl/s3_both.c +++ b/ssl/s3_both.c @@ -57,11 +57,11 @@ */ #include -#include "buffer.h" -#include "rand.h" -#include "objects.h" -#include "evp.h" -#include "x509.h" +#include +#include +#include +#include +#include #include "ssl_locl.h" #define BREAK break diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 6c8eefbdcf..c2d33fef05 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -57,10 +57,10 @@ */ #include -#include "buffer.h" -#include "rand.h" -#include "objects.h" -#include "evp.h" +#include +#include +#include +#include #include "ssl_locl.h" #define BREAK break diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index dfddb51d17..2113ff3250 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -57,7 +57,7 @@ */ #include -#include "evp.h" +#include #include "ssl_locl.h" static unsigned char ssl3_pad_1[48]={ diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index aefb38bbe8..14f6ac4fa6 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -57,7 +57,7 @@ */ #include -#include "objects.h" +#include #include "ssl_locl.h" const char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT; diff --git a/ssl/s3_meth.c b/ssl/s3_meth.c index d70165cb40..01147023a2 100644 --- a/ssl/s3_meth.c +++ b/ssl/s3_meth.c @@ -57,7 +57,7 @@ */ #include -#include "objects.h" +#include #include "ssl_locl.h" #ifndef NOPROTO diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index 468831ae86..ebb3b6f9f7 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -59,8 +59,8 @@ #include #include #define USE_SOCKETS -#include "evp.h" -#include "buffer.h" +#include +#include #include "ssl_locl.h" /* SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_SSLV3_ALERT_PEER_ERROR_NO_CIPHER); diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index d3c2680e56..60bdf262fc 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -59,11 +59,11 @@ #define REUSE_CIPHER_BUG #include -#include "buffer.h" -#include "rand.h" -#include "objects.h" -#include "evp.h" -#include "x509.h" +#include +#include +#include +#include +#include #include "ssl_locl.h" #define BREAK break diff --git a/ssl/ssl.c b/ssl/ssl.c index 1f769a18f2..f3e8cd4d43 100644 --- a/ssl/ssl.c +++ b/ssl/ssl.c @@ -63,27 +63,27 @@ #define USE_SOCKETS #include "../e_os.h" -#include "buffer.h" -#include "stack.h" -#include "lhash.h" +#include +#include +#include -#include "bio.h" -#include "err.h" +#include +#include -#include "bn.h" +#include -#include "rand.h" -#include "conf.h" -#include "txt_db.h" +#include +#include +#include -#include "err.h" -#include "evp.h" +#include +#include -#include "x509.h" -#include "pkcs7.h" -#include "pem.h" -#include "asn1.h" -#include "objects.h" +#include +#include +#include +#include +#include #include "ssl_locl.h" diff --git a/ssl/ssl.h b/ssl/ssl.h index 9605e343dd..1f42348277 100644 --- a/ssl/ssl.h +++ b/ssl/ssl.h @@ -63,7 +63,7 @@ extern "C" { #endif -#include "safestack.h" +#include /* SSLeay version number for ASN.1 encoding of the session information */ /* Version 0 - initial version @@ -144,11 +144,11 @@ extern "C" { #define SSL_SENT_SHUTDOWN 1 #define SSL_RECEIVED_SHUTDOWN 2 -#include "crypto.h" -#include "lhash.h" -#include "buffer.h" -#include "bio.h" -#include "x509.h" +#include +#include +#include +#include +#include #define SSL_FILETYPE_ASN1 X509_FILETYPE_ASN1 #define SSL_FILETYPE_PEM X509_FILETYPE_PEM @@ -603,10 +603,10 @@ struct ssl_st * SSLv3/TLS rolback check */ }; -#include "ssl2.h" -#include "ssl3.h" -#include "tls1.h" /* This is mostly sslv3 with a few tweaks */ -#include "ssl23.h" +#include +#include +#include /* This is mostly sslv3 with a few tweaks */ +#include /* compatablity */ #define SSL_set_app_data(s,arg) (SSL_set_ex_data(s,0,(char *)arg)) diff --git a/ssl/ssl3.h b/ssl/ssl3.h index 2e2ee98929..23375f16ea 100644 --- a/ssl/ssl3.h +++ b/ssl/ssl3.h @@ -59,7 +59,7 @@ #ifndef HEADER_SSL3_H #define HEADER_SSL3_H -#include "buffer.h" +#include #ifdef __cplusplus extern "C" { diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c index 0c0e8da482..6e198ecac5 100644 --- a/ssl/ssl_algs.c +++ b/ssl/ssl_algs.c @@ -57,8 +57,8 @@ */ #include -#include "objects.h" -#include "lhash.h" +#include +#include #include "ssl_locl.h" int SSL_library_init(void) diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c index 7454ba39ac..b8ae9d6814 100644 --- a/ssl/ssl_asn1.c +++ b/ssl/ssl_asn1.c @@ -58,8 +58,8 @@ #include #include -#include "asn1_mac.h" -#include "objects.h" +#include +#include #include "ssl_locl.h" typedef struct ssl_session_asn1_st diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 90eb769ea6..88cc5fc21a 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -61,9 +61,9 @@ #ifndef WIN32 #include #endif -#include "objects.h" -#include "bio.h" -#include "pem.h" +#include +#include +#include #include "ssl_locl.h" int SSL_get_ex_data_X509_STORE_CTX_idx(void) diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index b5d6f09969..d684758a86 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -57,8 +57,8 @@ */ #include -#include "objects.h" -#include "comp.h" +#include +#include #include "ssl_locl.h" #define SSL_ENC_DES_IDX 0 diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c index a9c2b6f66e..cfffe63ff2 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c @@ -56,8 +56,8 @@ * [including the GNU Public Licence.] */ #include -#include "err.h" -#include "ssl.h" +#include +#include /* BEGIN ERROR CODES */ #ifndef NO_ERR diff --git a/ssl/ssl_err2.c b/ssl/ssl_err2.c index dc8d038875..cc089a612b 100644 --- a/ssl/ssl_err2.c +++ b/ssl/ssl_err2.c @@ -57,8 +57,8 @@ */ #include -#include "err.h" -#include "ssl.h" +#include +#include void SSL_load_error_strings(void) { diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 6479e38959..3560c7c189 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -59,8 +59,8 @@ */ #include -#include "objects.h" -#include "lhash.h" +#include +#include #include "ssl_locl.h" char *SSL_version_str=OPENSSL_VERSION_TEXT; diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index be0c814ed5..7b270c63d5 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -63,17 +63,17 @@ #include #include -#include "e_os.h" - -#include "buffer.h" -#include "comp.h" -#include "bio.h" -#include "crypto.h" -#include "evp.h" -#include "stack.h" -#include "x509.h" -#include "err.h" -#include "ssl.h" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include #define PKCS1_CHECK diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c index 9d10831ca0..fde484ba2f 100644 --- a/ssl/ssl_rsa.c +++ b/ssl/ssl_rsa.c @@ -57,11 +57,11 @@ */ #include -#include "bio.h" -#include "objects.h" -#include "evp.h" -#include "x509.h" -#include "pem.h" +#include +#include +#include +#include +#include #include "ssl_locl.h" #ifndef NOPROTO diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 3422099ace..26a80d6663 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -57,8 +57,8 @@ */ #include -#include "lhash.h" -#include "rand.h" +#include +#include #include "ssl_locl.h" #ifndef NOPROTO diff --git a/ssl/ssl_task.c b/ssl/ssl_task.c index ab72166665..05f9325904 100644 --- a/ssl/ssl_task.c +++ b/ssl/ssl_task.c @@ -123,11 +123,11 @@ int LIB$INIT_TIMER(), LIB$SHOW_TIMER(); #include /* from ssltest.c */ #include -#include "buffer.h" +#include #include "../e_os.h" -#include "x509.h" -#include "ssl.h" -#include "err.h" +#include +#include +#include int MS_CALLBACK verify_callback(int ok, X509 *xs, X509 *xi, int depth, int error); diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c index c1b2a8652a..df0af09750 100644 --- a/ssl/ssl_txt.c +++ b/ssl/ssl_txt.c @@ -57,7 +57,7 @@ */ #include -#include "buffer.h" +#include #include "ssl_locl.h" #ifndef NO_FP_API diff --git a/ssl/ssltest.c b/ssl/ssltest.c index ef80d42990..b6425c2217 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -60,12 +60,12 @@ #include #include #include -#include "e_os.h" -#include "bio.h" -#include "crypto.h" -#include "x509.h" -#include "ssl.h" -#include "err.h" +#include +#include +#include +#include +#include +#include #ifdef WINDOWS #include "../crypto/bio/bss_file.c" #endif diff --git a/ssl/t1_clnt.c b/ssl/t1_clnt.c index 429ad0eca5..0e068c3816 100644 --- a/ssl/t1_clnt.c +++ b/ssl/t1_clnt.c @@ -57,10 +57,10 @@ */ #include -#include "buffer.h" -#include "rand.h" -#include "objects.h" -#include "evp.h" +#include +#include +#include +#include #include "ssl_locl.h" #ifndef NOPROTO diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 99af1966e6..05a3382af9 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -57,9 +57,9 @@ */ #include -#include "comp.h" -#include "evp.h" -#include "hmac.h" +#include +#include +#include #include "ssl_locl.h" static void tls1_P_hash(const EVP_MD *md, const unsigned char *sec, diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 746ef7edff..ddf5c15799 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -57,7 +57,7 @@ */ #include -#include "objects.h" +#include #include "ssl_locl.h" char *tls1_version_str="TLSv1" OPENSSL_VERSION_PTEXT; diff --git a/ssl/t1_meth.c b/ssl/t1_meth.c index 888ea3e6a8..2632773895 100644 --- a/ssl/t1_meth.c +++ b/ssl/t1_meth.c @@ -57,7 +57,7 @@ */ #include -#include "objects.h" +#include #include "ssl_locl.h" #ifndef NOPROTO diff --git a/ssl/t1_srvr.c b/ssl/t1_srvr.c index 7e65f263fc..d2655d52cd 100644 --- a/ssl/t1_srvr.c +++ b/ssl/t1_srvr.c @@ -57,11 +57,11 @@ */ #include -#include "buffer.h" -#include "rand.h" -#include "objects.h" -#include "evp.h" -#include "x509.h" +#include +#include +#include +#include +#include #include "ssl_locl.h" #ifndef NOPROTO diff --git a/ssl/tls1.h b/ssl/tls1.h index e956761fec..07dfe2b13d 100644 --- a/ssl/tls1.h +++ b/ssl/tls1.h @@ -59,7 +59,7 @@ #ifndef HEADER_TLS1_H #define HEADER_TLS1_H -#include "buffer.h" +#include #ifdef __cplusplus extern "C" { -- cgit v1.2.3