kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed compilation errors with patch-ba and "old" OpenSSL versions. Can

Browse source 
someone please have a look if the data types are all correct, as I don't
know OpenSSL.
This commit is contained in:
rillig 2006-03-13 22:58:45 +00:00
parent a0f77478f8
commit 3257e6ac7c
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
devel/pwlib/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.17 2006/03/13 21:20:24 joerg Exp $
$NetBSD: distinfo,v 1.18 2006/03/13 22:58:45 rillig Exp $
SHA1 (pwlib-v1_8_3-src-tar.gz) = d3a6eff571ebfd37889e75cbaef75983e6119d2e
RMD160 (pwlib-v1_8_3-src-tar.gz) = 1ce2544ef631c8344543e62988f97022c998bb05
@ -26,6 +26,6 @@ SHA1 (patch-at) = 87bbff9a5426c18c3e8407406b244eef2413cdbd
SHA1 (patch-au) = 4947ee29e91c84f39a370ebc128c1e67737234d1
SHA1 (patch-av) = 2bb533f6a29f10d357aed1b12c0bfc43af8a4f3b
SHA1 (patch-aw) = 236cb19fc7f0b78055b0634b3821c099318abb9f
SHA1 (patch-ba) = 3abd3cc7f323e428843c574e9729ae0005bd5fa2
SHA1 (patch-ba) = ba9538222c5e6fb64c6211c7bda364ef31beeaf4
SHA1 (patch-bb) = 03345fade582539c3b7332f14f1956686ad15289
SHA1 (patch-bd) = 2d2fb1c6772a1e015cc1bceeb27fda39f57f5acc

25
devel/pwlib/patches/patch-ba
View file

@ -1,16 +1,15 @@
$NetBSD: patch-ba,v 1.4 2006/03/13 21:20:24 joerg Exp $
$NetBSD: patch-ba,v 1.5 2006/03/13 22:58:45 rillig Exp $
--- 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
--- 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
@@ -297,14 +297,22 @@ PSSLPrivateKey::PSSLPrivateKey(const PFi
PSSLPrivateKey::PSSLPrivateKey(const BYTE * keyData, PINDEX keySize)
{
- key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyData, keySize);
+#if OPENSSL_VERSION_NUMBER >= 0x00908000L
+ key = d2i_AutoPrivateKey(NULL, &keyData, keySize);
+#else
+ key = d2i_AutoPrivateKey(NULL, (BYE **)&keyData, keySize);
key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyData, keySize);
+#endif
}
@ -21,7 +20,7 @@ $NetBSD: patch-ba,v 1.4 2006/03/13 21:20:24 joerg Exp $
const BYTE * keyPtr = keyData;
- key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyPtr, keyData.GetSize());
+#else
+ BYTE * keyPtr = (BYTE *)keyData;
+ BYTE * keyPtr = (BYTE *)&keyData;
+#endif
+ key = d2i_AutoPrivateKey(NULL, &keyPtr, keyData.GetSize());
}
@ -42,11 +41,12 @@ $NetBSD: patch-ba,v 1.4 2006/03/13 21:20:24 joerg Exp $
PSSLCertificate::PSSLCertificate(const PBYTEArray & certData)
{
+#if OPENSSL_VERSION_NUMBER >= 0x00908000L
const BYTE * certPtr = 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;
+ BYTE *certPtr = (BYTE *)&certData;
+#endif
+ certificate = d2i_X509(NULL, &certPtr, certData.GetSize());
}
@ -56,11 +56,12 @@ $NetBSD: patch-ba,v 1.4 2006/03/13 21:20:24 joerg Exp $
PBYTEArray certData;
PBase64::Decode(certStr, certData);
if (certData.GetSize() > 0) {
+#if OPENSSL_VERSION_NUMBER >= 0x00908000L
const BYTE * certPtr = 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;
+ BYTE *certPtr = (BYTE *)&certData;
+#endif
+ certificate = d2i_X509(NULL, &certPtr, certData.GetSize());
}