From c0bc0d4d32ab07a66fac5b1879ad014265fb54f5 Mon Sep 17 00:00:00 2001 From: Dave Schuyler Date: Fri, 23 Sep 2005 02:01:10 +0000 Subject: [PATCH] changed include to double quotes --- dtool/src/prc/configPage.cxx | 2 +- dtool/src/prc/prcKeyRegistry.cxx | 2 +- dtool/src/prc/prcKeyRegistry.h | 2 +- dtool/src/prckeys/makePrcKey.cxx | 10 +++++----- dtool/src/prckeys/signPrcFile_src.cxx | 10 +++++----- panda/src/downloader/bioPtr.h | 2 +- panda/src/downloader/bioStreamBuf.h | 2 +- panda/src/downloader/bioStreamPtr.h | 2 +- panda/src/downloader/httpChannel.cxx | 2 +- panda/src/downloader/httpChannel.h | 2 +- panda/src/downloader/httpClient.cxx | 4 ++-- panda/src/downloader/httpClient.h | 2 +- panda/src/downloader/httpDigestAuthorization.cxx | 4 ++-- panda/src/downloader/ssl_utils.cxx | 2 +- panda/src/downloader/ssl_utils.h | 2 +- panda/src/express/encryptStreamBuf.cxx | 2 +- panda/src/express/encryptStreamBuf.h | 2 +- panda/src/express/hashVal.cxx | 2 +- panda/src/express/password_hash.cxx | 2 +- 19 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dtool/src/prc/configPage.cxx b/dtool/src/prc/configPage.cxx index c1f0f0aca9..d5bb2dd707 100644 --- a/dtool/src/prc/configPage.cxx +++ b/dtool/src/prc/configPage.cxx @@ -26,7 +26,7 @@ #include #ifdef HAVE_OPENSSL -#include +#include "openssl/evp.h" #endif ConfigPage *ConfigPage::_default_page = NULL; diff --git a/dtool/src/prc/prcKeyRegistry.cxx b/dtool/src/prc/prcKeyRegistry.cxx index 6e0375223b..0a01ac7116 100644 --- a/dtool/src/prc/prcKeyRegistry.cxx +++ b/dtool/src/prc/prcKeyRegistry.cxx @@ -25,7 +25,7 @@ #ifdef HAVE_OPENSSL -#include +#include "openssl/pem.h" PrcKeyRegistry *PrcKeyRegistry::_global_ptr = NULL; diff --git a/dtool/src/prc/prcKeyRegistry.h b/dtool/src/prc/prcKeyRegistry.h index 5b7617af48..6864563da3 100644 --- a/dtool/src/prc/prcKeyRegistry.h +++ b/dtool/src/prc/prcKeyRegistry.h @@ -28,7 +28,7 @@ #ifdef HAVE_OPENSSL #include "pvector.h" -#include +#include "openssl/evp.h" // Some versions of OpenSSL appear to define this as a macro. Yucky. #undef set_key diff --git a/dtool/src/prckeys/makePrcKey.cxx b/dtool/src/prckeys/makePrcKey.cxx index 0c260fb12e..66a202f1d0 100644 --- a/dtool/src/prckeys/makePrcKey.cxx +++ b/dtool/src/prckeys/makePrcKey.cxx @@ -27,11 +27,11 @@ #include PRC_PUBLIC_KEYS_INCLUDE #endif -#include -#include -#include -#include -#include +#include "openssl/rsa.h" +#include "openssl/err.h" +#include "openssl/pem.h" +#include "openssl/rand.h" +#include "openssl/bio.h" #ifndef HAVE_GETOPT #include "gnu_getopt.h" diff --git a/dtool/src/prckeys/signPrcFile_src.cxx b/dtool/src/prckeys/signPrcFile_src.cxx index 968a36aa62..280f2d9dd3 100644 --- a/dtool/src/prckeys/signPrcFile_src.cxx +++ b/dtool/src/prckeys/signPrcFile_src.cxx @@ -27,11 +27,11 @@ #include -#include -#include -#include -#include -#include +#include "openssl/err.h" +#include "openssl/pem.h" +#include "openssl/rand.h" +#include "openssl/bio.h" +#include "openssl/evp.h" #ifndef HAVE_GETOPT #include "gnu_getopt.h" diff --git a/panda/src/downloader/bioPtr.h b/panda/src/downloader/bioPtr.h index 2f4ed89ff8..c4dc6ede23 100644 --- a/panda/src/downloader/bioPtr.h +++ b/panda/src/downloader/bioPtr.h @@ -26,7 +26,7 @@ #define OPENSSL_NO_KRB5 #include "referenceCount.h" -#include +#include "openssl/ssl.h" class URLSpec; diff --git a/panda/src/downloader/bioStreamBuf.h b/panda/src/downloader/bioStreamBuf.h index 18317f0eb1..e12f7dc824 100644 --- a/panda/src/downloader/bioStreamBuf.h +++ b/panda/src/downloader/bioStreamBuf.h @@ -27,7 +27,7 @@ #include "bioPtr.h" #include "pointerTo.h" -#include +#include "openssl/ssl.h" //////////////////////////////////////////////////////////////////// // Class : BioStreamBuf diff --git a/panda/src/downloader/bioStreamPtr.h b/panda/src/downloader/bioStreamPtr.h index 4365e53d03..b0a1d98f51 100644 --- a/panda/src/downloader/bioStreamPtr.h +++ b/panda/src/downloader/bioStreamPtr.h @@ -27,7 +27,7 @@ #include "bioStream.h" #include "referenceCount.h" -#include +#include "openssl/ssl.h" //////////////////////////////////////////////////////////////////// // Class : BioStreamPtr diff --git a/panda/src/downloader/httpChannel.cxx b/panda/src/downloader/httpChannel.cxx index 5375b78362..c7170a0a48 100644 --- a/panda/src/downloader/httpChannel.cxx +++ b/panda/src/downloader/httpChannel.cxx @@ -28,7 +28,7 @@ #include "ramfile.h" #ifdef HAVE_OPENSSL -#include +#include "openssl/x509.h" #ifdef WIN32_VC #include // for select() diff --git a/panda/src/downloader/httpChannel.h b/panda/src/downloader/httpChannel.h index 3f508e2bbc..41b72a2f1b 100644 --- a/panda/src/downloader/httpChannel.h +++ b/panda/src/downloader/httpChannel.h @@ -41,7 +41,7 @@ #include "pointerTo.h" #include "config_downloader.h" #include "filename.h" -#include +#include "openssl/ssl.h" class Ramfile; class HTTPClient; diff --git a/panda/src/downloader/httpClient.cxx b/panda/src/downloader/httpClient.cxx index 518de74f14..d4f073fb75 100644 --- a/panda/src/downloader/httpClient.cxx +++ b/panda/src/downloader/httpClient.cxx @@ -30,8 +30,8 @@ #ifdef HAVE_OPENSSL -#include -#include +#include "openssl/rand.h" +#include "openssl/err.h" // Windows may define this macro inappropriately. #ifdef X509_NAME diff --git a/panda/src/downloader/httpClient.h b/panda/src/downloader/httpClient.h index 77d9cd06cd..57eca44e48 100644 --- a/panda/src/downloader/httpClient.h +++ b/panda/src/downloader/httpClient.h @@ -39,7 +39,7 @@ #include "pmap.h" #include "pset.h" -#include +#include "openssl/ssl.h" // Windows may define this macro inappropriately. #ifdef X509_NAME diff --git a/panda/src/downloader/httpDigestAuthorization.cxx b/panda/src/downloader/httpDigestAuthorization.cxx index 6492e701fe..91bcffa72f 100644 --- a/panda/src/downloader/httpDigestAuthorization.cxx +++ b/panda/src/downloader/httpDigestAuthorization.cxx @@ -20,8 +20,8 @@ #ifdef HAVE_OPENSSL -#include -#include +#include "openssl/ssl.h" +#include "openssl/md5.h" #include const string HTTPDigestAuthorization::_mechanism = "digest"; diff --git a/panda/src/downloader/ssl_utils.cxx b/panda/src/downloader/ssl_utils.cxx index 81c7f29db7..d4f9f704b8 100644 --- a/panda/src/downloader/ssl_utils.cxx +++ b/panda/src/downloader/ssl_utils.cxx @@ -22,7 +22,7 @@ #ifdef HAVE_OPENSSL #ifdef REPORT_OPENSSL_ERRORS -#include +#include "openssl/err.h" #endif //////////////////////////////////////////////////////////////////// diff --git a/panda/src/downloader/ssl_utils.h b/panda/src/downloader/ssl_utils.h index 8b28fa0154..eab9292b0e 100644 --- a/panda/src/downloader/ssl_utils.h +++ b/panda/src/downloader/ssl_utils.h @@ -25,7 +25,7 @@ #ifdef HAVE_OPENSSL #define OPENSSL_NO_KRB5 -#include +#include "openssl/ssl.h" EXPCL_PANDAEXPRESS void notify_ssl_errors(); diff --git a/panda/src/express/encryptStreamBuf.cxx b/panda/src/express/encryptStreamBuf.cxx index 8729ecaa15..19cdd3605a 100644 --- a/panda/src/express/encryptStreamBuf.cxx +++ b/panda/src/express/encryptStreamBuf.cxx @@ -23,7 +23,7 @@ #ifdef HAVE_OPENSSL -#include +#include "openssl/rand.h" #ifndef HAVE_STREAMSIZE // Some compilers (notably SGI) don't define this for us diff --git a/panda/src/express/encryptStreamBuf.h b/panda/src/express/encryptStreamBuf.h index 747a2ecd37..dbb93ae72b 100644 --- a/panda/src/express/encryptStreamBuf.h +++ b/panda/src/express/encryptStreamBuf.h @@ -24,7 +24,7 @@ // This module is not compiled if OpenSSL is not available. #ifdef HAVE_OPENSSL -#include +#include "openssl/evp.h" //////////////////////////////////////////////////////////////////// // Class : EncryptStreamBuf diff --git a/panda/src/express/hashVal.cxx b/panda/src/express/hashVal.cxx index 17ff12499f..3674c21397 100644 --- a/panda/src/express/hashVal.cxx +++ b/panda/src/express/hashVal.cxx @@ -22,7 +22,7 @@ #include #ifdef HAVE_OPENSSL -#include +#include "openssl/md5.h" #endif // HAVE_OPENSSL diff --git a/panda/src/express/password_hash.cxx b/panda/src/express/password_hash.cxx index 2ef0f46d55..bc1350819a 100644 --- a/panda/src/express/password_hash.cxx +++ b/panda/src/express/password_hash.cxx @@ -22,7 +22,7 @@ // within OpenSSL. #ifdef HAVE_OPENSSL -#include +#include "openssl/evp.h" //////////////////////////////////////////////////////////////////// // Function: password_hash