1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
$NetBSD: patch-ba,v 1.3 2006/01/08 04:57:55 joerg 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
@@ -297,14 +297,14 @@ PSSLPrivateKey::PSSLPrivateKey(const PFi
PSSLPrivateKey::PSSLPrivateKey(const BYTE * keyData, PINDEX keySize)
{
- key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyData, keySize);
+ key = d2i_AutoPrivateKey(NULL, &keyData, keySize);
}
PSSLPrivateKey::PSSLPrivateKey(const PBYTEArray & keyData)
{
const BYTE * keyPtr = keyData;
- key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyPtr, keyData.GetSize());
+ key = d2i_AutoPrivateKey(NULL, &keyPtr, keyData.GetSize());
}
@@ -472,14 +472,14 @@ PSSLCertificate::PSSLCertificate(const P
PSSLCertificate::PSSLCertificate(const BYTE * certData, PINDEX certSize)
{
- certificate = d2i_X509(NULL, (unsigned char **)&certData, certSize);
+ certificate = d2i_X509(NULL, &certData, certSize);
}
PSSLCertificate::PSSLCertificate(const PBYTEArray & certData)
{
const BYTE * certPtr = certData;
- certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize());
+ certificate = d2i_X509(NULL, &certPtr, certData.GetSize());
}
@@ -489,7 +489,7 @@ PSSLCertificate::PSSLCertificate(const P
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, &certPtr, certData.GetSize());
}
else
certificate = NULL;
@@ -743,7 +743,7 @@ PSSLDiffieHellman::~PSSLDiffieHellman()
DH_free(dh);
}
-#ifdef __BEOS__
+#if defined(__BEOS__) || defined(__NetBSD__)
// 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
|
