49 lines
1.4 KiB
Plaintext
49 lines
1.4 KiB
Plaintext
$OpenBSD: patch-kio_kssl_kopenssl_h,v 1.3 2010/10/06 08:13:32 landry Exp $
|
|
--- kio/kssl/kopenssl.h.orig Sat Jul 22 10:16:39 2006
|
|
+++ kio/kssl/kopenssl.h Sun Oct 3 19:53:42 2010
|
|
@@ -48,6 +48,7 @@ class KOpenSSLProxyPrivate;
|
|
#include <openssl/stack.h>
|
|
#include <openssl/bn.h>
|
|
#undef crypt
|
|
+#define STACK _STACK
|
|
#endif
|
|
|
|
#include <kstaticdeleter.h>
|
|
@@ -448,12 +449,6 @@ friend class KStaticDeleter<KOpenSSLProxy>; (public)
|
|
|
|
|
|
/*
|
|
- * X509_asn1_meth - used for netscape output
|
|
- */
|
|
- ASN1_METHOD *X509_asn1_meth();
|
|
-
|
|
-
|
|
- /*
|
|
* ASN1_i2d_fp - used for netscape output
|
|
*/
|
|
int ASN1_i2d_fp(FILE *out, unsigned char *x);
|
|
@@ -531,6 +526,7 @@ friend class KStaticDeleter<KOpenSSLProxy>; (public)
|
|
*/
|
|
void sk_free(STACK *s);
|
|
|
|
+ void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
|
|
|
|
/*
|
|
* Number of elements in the stack
|
|
@@ -543,6 +539,7 @@ friend class KStaticDeleter<KOpenSSLProxy>; (public)
|
|
*/
|
|
char *sk_value(STACK *s, int n);
|
|
|
|
+ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
|
|
|
|
/*
|
|
* Create a new stack
|
|
@@ -555,6 +552,7 @@ friend class KStaticDeleter<KOpenSSLProxy>; (public)
|
|
*/
|
|
int sk_push(STACK *s, char *d);
|
|
|
|
+ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
|
|
|
|
/*
|
|
* Duplicate the stack
|