Fix after const changes in libcrypto.

looks good to jsing
This commit is contained in:
tb 2018-05-12 17:48:30 +00:00
parent caaa90e552
commit b64a1f7c77
2 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_qt_qtbase_src_network_ssl_qsslsocket_openssl_symbols_cpp,v 1.1 2018/05/12 17:48:30 tb Exp $
Index: src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
--- src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp.orig
+++ src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -136,10 +136,10 @@ DEFINEFUNC(int, ASN1_STRING_length, ASN1_STRING *a, a,
DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return);
DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return)
DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return)
-DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return)
+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return)
DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return)
DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return)
-DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return)
DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return)
#ifndef OPENSSL_NO_EC

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_qt_qtbase_src_network_ssl_qsslsocket_openssl_symbols_p_h,v 1.1 2018/05/12 17:48:30 tb Exp $
Index: src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
--- src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h.orig
+++ src/qt/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -215,10 +215,10 @@ int q_ASN1_STRING_length(ASN1_STRING *a);
int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b);
long q_BIO_ctrl(BIO *a, int b, long c, void *d);
int q_BIO_free(BIO *a);
-BIO *q_BIO_new(BIO_METHOD *a);
+BIO *q_BIO_new(const BIO_METHOD *a);
BIO *q_BIO_new_mem_buf(void *a, int b);
int q_BIO_read(BIO *a, void *b, int c);
-BIO_METHOD *q_BIO_s_mem();
+const BIO_METHOD *q_BIO_s_mem();
int q_BIO_write(BIO *a, const void *b, int c);
int q_BN_num_bits(const BIGNUM *a);
#ifndef OPENSSL_NO_EC