head 1.7; access; symbols pkgsrc-2026Q1:1.7.0.144 pkgsrc-2026Q1-base:1.7 pkgsrc-2025Q4:1.7.0.142 pkgsrc-2025Q4-base:1.7 pkgsrc-2025Q3:1.7.0.140 pkgsrc-2025Q3-base:1.7 pkgsrc-2025Q2:1.7.0.138 pkgsrc-2025Q2-base:1.7 pkgsrc-2025Q1:1.7.0.136 pkgsrc-2025Q1-base:1.7 pkgsrc-2024Q4:1.7.0.134 pkgsrc-2024Q4-base:1.7 pkgsrc-2024Q3:1.7.0.132 pkgsrc-2024Q3-base:1.7 pkgsrc-2024Q2:1.7.0.130 pkgsrc-2024Q2-base:1.7 pkgsrc-2024Q1:1.7.0.128 pkgsrc-2024Q1-base:1.7 pkgsrc-2023Q4:1.7.0.126 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.124 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.122 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.120 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.7.0.118 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.7.0.116 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.7.0.114 pkgsrc-2022Q2-base:1.7 pkgsrc-2022Q1:1.7.0.112 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.110 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.108 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.106 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.104 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.102 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.100 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.96 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.76 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.98 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.94 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.92 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.90 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.88 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.86 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.84 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.82 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.80 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.78 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.74 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.72 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.70 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.68 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.66 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.64 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.62 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.60 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.58 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.56 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.54 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.7.0.52 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.7.0.50 pkgsrc-2014Q2-base:1.7 pkgsrc-2014Q1:1.7.0.48 pkgsrc-2014Q1-base:1.7 pkgsrc-2013Q4:1.7.0.46 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.44 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.42 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.40 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.38 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.36 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.34 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.32 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.30 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.28 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.26 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.24 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.22 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.20 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.18 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.16 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.14 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.12 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.10 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.8 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.6 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.4 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.2 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.6.0.14 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.12 pkgsrc-2008Q1:1.6.0.10 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.8 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.6 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.4 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.2 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.5.0.8 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.6 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.4 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.2 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.2.0.10 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.8 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.6 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.4 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.2 pkgsrc-2004Q4-base:1.2; locks; strict; comment @# @; 1.7 date 2008.08.17.21.46.06; author dholland; state Exp; branches; next 1.6; 1.6 date 2007.03.14.17.12.48; author yyamano; state Exp; branches; next 1.5; 1.5 date 2006.03.13.22.58.45; author rillig; state Exp; branches; next 1.4; 1.4 date 2006.03.13.21.20.24; author joerg; state Exp; branches; next 1.3; 1.3 date 2006.01.08.04.57.55; author joerg; state Exp; branches; next 1.2; 1.2 date 2004.10.09.14.01.03; author mjl; state Exp; branches; next 1.1; 1.1 date 2004.10.08.21.02.54; author mjl; state Exp; branches; next ; desc @@ 1.7 log @Fix build failure on -current caused by openssl API change. @ text @$NetBSD: patch-ba,v 1.6 2007/03/14 17:12:48 yyamano Exp $ --- src/ptclib/pssl.cxx.orig 2004-04-09 02:52:17.000000000 -0400 +++ src/ptclib/pssl.cxx 2008-08-17 17:30:14.000000000 -0400 @@@@ -297,14 +297,22 @@@@ PSSLPrivateKey::PSSLPrivateKey(const PFi PSSLPrivateKey::PSSLPrivateKey(const BYTE * keyData, PINDEX keySize) { +#if OPENSSL_VERSION_NUMBER >= 0x00908000L + key = d2i_AutoPrivateKey(NULL, &keyData, keySize); +#else key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyData, keySize); +#endif } PSSLPrivateKey::PSSLPrivateKey(const PBYTEArray & keyData) { +#if OPENSSL_VERSION_NUMBER >= 0x00908000L const BYTE * keyPtr = keyData; - key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyPtr, keyData.GetSize()); +#else + BYTE * keyPtr = (BYTE *)&keyData; +#endif + key = d2i_AutoPrivateKey(NULL, &keyPtr, keyData.GetSize()); } @@@@ -472,14 +480,22 @@@@ PSSLCertificate::PSSLCertificate(const P PSSLCertificate::PSSLCertificate(const BYTE * certData, PINDEX certSize) { - certificate = d2i_X509(NULL, (unsigned char **)&certData, certSize); +#if OPENSSL_VERSION_NUMBER >= 0x00908000L + certificate = d2i_X509(NULL, &certData, certSize); +#else + certificate = d2i_X509(NULL, (BYTE **)&certData, certSize); +#endif } PSSLCertificate::PSSLCertificate(const PBYTEArray & certData) { - const BYTE * certPtr = certData; - certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize()); +#if OPENSSL_VERSION_NUMBER >= 0x00908000L + const BYTE *certPtr = certData; +#else + BYTE *certPtr = (BYTE *)&certData; +#endif + certificate = d2i_X509(NULL, &certPtr, certData.GetSize()); } @@@@ -488,8 +504,12 @@@@ PSSLCertificate::PSSLCertificate(const P PBYTEArray certData; PBase64::Decode(certStr, certData); if (certData.GetSize() > 0) { - const BYTE * certPtr = certData; - certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize()); +#if OPENSSL_VERSION_NUMBER >= 0x00908000L + const BYTE *certPtr = certData; +#else + BYTE *certPtr = (BYTE *)&certData; +#endif + certificate = d2i_X509(NULL, &certPtr, certData.GetSize()); } else certificate = NULL; @@@@ -743,7 +763,7 @@@@ PSSLDiffieHellman::~PSSLDiffieHellman() DH_free(dh); } -#ifdef __BEOS__ +#if defined(__BEOS__) || ((defined(__NetBSD__) || defined(__APPLE__)) && OPENSSL_VERSION_NUMBER < 0x00908000L) // 2/21/04 Yuri Kiryanov - fix for compiler choke on BeOS for usage of // SSL function d2i_DHparams_bio below in PSSLDiffieHellman::Load #undef d2i_DHparams_bio @@@@ -862,6 +882,9 @@@@ PSSLContext::PSSLContext(const void * se InitialisationMutex.Signal(); // create the new SSL context +#if OPENSSL_VERSION_NUMBER >= 0x00909000L + const +#endif SSL_METHOD * meth = SSLv23_method(); context = SSL_CTX_new(meth); if (context == NULL) @ 1.6 log @Make this build on Darwin. The changes are taken from pwlib repository pmachdep.h rev. 1.69 pssl.cxx rev. 1.42 maccoreaudio.cxx rev. 1.15 udll.cxx ewv. 1.18 @ text @d1 1 a1 1 $NetBSD: patch-ba,v 1.5 2006/03/13 22:58:45 rillig Exp $ d3 2 a4 2 --- src/ptclib/pssl.cxx.orig 2004-04-09 15:52:17.000000000 +0900 +++ src/ptclib/pssl.cxx d79 10 @ 1.5 log @Fixed compilation errors with patch-ba and "old" OpenSSL versions. Can someone please have a look if the data types are all correct, as I don't know OpenSSL. @ text @d1 1 a1 1 $NetBSD: patch-ba,v 1.3 2006/01/08 04:57:55 joerg Exp $ d3 2 a4 2 --- src/ptclib/pssl.cxx.orig 2004-04-09 08:52:17.000000000 +0200 +++ src/ptclib/pssl.cxx 2006-03-13 23:48:01.000000000 +0100 d75 1 a75 1 +#if defined(__BEOS__) || (defined(__NetBSD__) && OPENSSL_VERSION_NUMBER < 0x00908000L) @ 1.4 log @Try to fix compilation for older OpenSSL and NetBSD -current. Remove BROKEN_IN. @ text @d3 2 a4 2 --- src/ptclib/pssl.cxx.orig 2004-10-09 13:31:30.000000000 +0200 +++ src/ptclib/pssl.cxx 2004-10-09 13:33:39.000000000 +0200 a8 1 - key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyData, keySize); d12 1 a12 1 + key = d2i_AutoPrivateKey(NULL, (BYE **)&keyData, keySize); d23 1 a23 1 + BYTE * keyPtr = (BYTE *)keyData; d44 2 d47 1 a47 2 const BYTE * certPtr = certData; - certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize()); d49 1 a49 1 + BYTE * certPtr = (BYTE *)certData; d59 2 d62 1 a62 2 const BYTE * certPtr = certData; - certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize()); d64 1 a64 1 + BYTE * certPtr = (BYTE **)certData; @ 1.3 log @Use SUBST framework. Readd some replacements in the mak files, since they are installed and should work without the pkgsrc framework to define e.g. LIBTOOL. Bump the revision for this. Fix the inclusion in Makefiles by crudely faking the installation directory layout. Remove some explicit casts which break with GCC 3.4 and OpenSSL 0.9.8, this might need to be conditionalized. Add DraogonFly support and somewhat cleanup the FreeBSD sound includes. @ text @d1 1 a1 1 $NetBSD: patch-ba,v 1.2 2004/10/09 14:01:03 mjl Exp $ d5 1 a5 1 @@@@ -297,14 +297,14 @@@@ PSSLPrivateKey::PSSLPrivateKey(const PFi d10 1 d12 3 d20 1 d23 3 d30 1 a30 1 @@@@ -472,14 +472,14 @@@@ PSSLCertificate::PSSLCertificate(const P d35 1 d37 3 d45 1 d48 3 d55 2 a56 1 @@@@ -489,7 +489,7 @@@@ PSSLCertificate::PSSLCertificate(const P d59 1 d62 3 d69 1 a69 1 @@@@ -743,7 +743,7 @@@@ PSSLDiffieHellman::~PSSLDiffieHellman() d74 1 a74 1 +#if defined(__BEOS__) || defined(__NetBSD__) @ 1.2 log @Update pwlib to 1.8.2 The development site silently moved away from openh323.org without even a notice on that page. That page still advertises 1.5.2 as the latest version, even though development is alive and kicking and is at 1.8.2 now. Oh well... @ text @d1 1 a1 1 $NetBSD$ d5 44 a48 1 @@@@ -743,7 +743,7 @@@@ @ 1.1 log @Update pwlib to 1.5.2 Make this compile with newer gcc versions, and bring in a more recent version of the library. No changelog is available unfortunately. @ text @d3 4 a6 5 Work around a C/C++ difference in openssl/dh.h --- src/ptclib/pssl.cxx.orig 2004-10-08 19:13:06.000000000 +0200 +++ src/ptclib/pssl.cxx 2004-10-08 19:43:28.000000000 +0200 @@@@ -732,6 +732,9 @@@@ d9 5 a13 7 +#define d2i_DHparams_bio(bp,x) (DH *)ASN1_d2i_bio((char *(*)(...))DH_new, \ + (char *(*)(...))d2i_DHparams,(bp),(unsigned char **)(x)) + BOOL PSSLDiffieHellman::Load(const PFilePath & dhFile, PSSLFileTypes fileType) { @