From f5639cac96aefc7ca73f90ef1849aefd8225e9d3 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 27 Jul 2005 10:38:16 +0000 Subject: [PATCH] Clifford Wolf: Fixed asterisk-oh323 (pwlib) for new openssl [2005072514580508257] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6267 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- .../avm/asterisk-oh323/asterisk-oh323.conf | 1 + .../asterisk-oh323/openssl-hotfix.patch.pwlib | 45 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 package/avm/asterisk-oh323/openssl-hotfix.patch.pwlib diff --git a/package/avm/asterisk-oh323/asterisk-oh323.conf b/package/avm/asterisk-oh323/asterisk-oh323.conf index ec3b5d04c..3d76596c9 100644 --- a/package/avm/asterisk-oh323/asterisk-oh323.conf +++ b/package/avm/asterisk-oh323/asterisk-oh323.conf @@ -3,6 +3,7 @@ ao323-premake() { tar $taropt $archdir/pwlib-Janus* cd pwlib + patch -p1 < $confdir/openssl-hotfix.patch.pwlib eval ./configure eval make $makeopt clean opt cd "$mydir" diff --git a/package/avm/asterisk-oh323/openssl-hotfix.patch.pwlib b/package/avm/asterisk-oh323/openssl-hotfix.patch.pwlib new file mode 100644 index 000000000..5fa5a15ab --- /dev/null +++ b/package/avm/asterisk-oh323/openssl-hotfix.patch.pwlib @@ -0,0 +1,45 @@ +--- ./src/ptclib/pssl.cxx.orig 2005-07-25 14:03:17.000000000 +0200 ++++ ./src/ptclib/pssl.cxx 2005-07-25 14:03:54.000000000 +0200 +@@ -297,14 +297,14 @@ + + PSSLPrivateKey::PSSLPrivateKey(const BYTE * keyData, PINDEX keySize) + { +- key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyData, keySize); ++ key = d2i_AutoPrivateKey(NULL, (const BYTE **)&keyData, keySize); + } + + + PSSLPrivateKey::PSSLPrivateKey(const PBYTEArray & keyData) + { + const BYTE * keyPtr = keyData; +- key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyPtr, keyData.GetSize()); ++ key = d2i_AutoPrivateKey(NULL, (const BYTE **)&keyPtr, keyData.GetSize()); + } + + +@@ -472,14 +472,14 @@ + + PSSLCertificate::PSSLCertificate(const BYTE * certData, PINDEX certSize) + { +- certificate = d2i_X509(NULL, (unsigned char **)&certData, certSize); ++ certificate = d2i_X509(NULL, (const unsigned char **)&certData, certSize); + } + + + PSSLCertificate::PSSLCertificate(const PBYTEArray & certData) + { + const BYTE * certPtr = certData; +- certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize()); ++ certificate = d2i_X509(NULL, (const unsigned char **)&certPtr, certData.GetSize()); + } + + +@@ -489,7 +489,7 @@ + PBase64::Decode(certStr, certData); + if (certData.GetSize() > 0) { + const BYTE * certPtr = certData; +- certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize()); ++ certificate = d2i_X509(NULL, (const unsigned char **)&certPtr, certData.GetSize()); + } + else + certificate = NULL;