Attachment 193559 Details for Bug 228344 – svn diff for net/qt5-network

[patch] svn diff for net/qt5-network

patch-net_qt5-network-LibreSSL2.7 (text/plain), 2.66 KB, created by Bernard Spil on 2018-05-20 12:53:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2018-05-20 12:53:11 UTC

Size: 2.66 KB

patch

obsolete

>Index: net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h
>===================================================================
>--- net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h	(nonexistent)
>+++ net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h	(working copy)
>@@ -0,0 +1,18 @@
>+--- src/network/ssl/qsslsocket_openssl11_symbols_p.h.orig	2018-02-08 18:24:48 UTC
>++++ src/network/ssl/qsslsocket_openssl11_symbols_p.h
>+@@ -75,6 +75,15 @@
>+ #error "You are not supposed to use this header file, include qsslsocket_openssl_symbols_p.h instead"
>+ #endif
>+ 
>++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
>++// LibreSSL 2.7 has stack_st but not OPENSSL_STACK
>++typedef struct stack_st OPENSSL_STACK; /* Use STACK_OF(...) instead */
>++// From the signature in LibreSSL
>++#define OPENSSL_INIT_SETTINGS void
>++// https://github.com/openssl/openssl/blob/master/include/openssl/x509_vfy.h#L63
>++typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *);
>++#endif
>++
>+ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
>+ 
>+ Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
>
>Property changes on: net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
>===================================================================
>--- net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h	(revision 470441)
>+++ net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h	(working copy)
>@@ -1,15 +1,6 @@
> Boilerplate for SSL_CTX_set1_groups() used in qsslcontext_openssl.cpp.
> --- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig	2017-11-30 13:49:46 UTC
> +++ src/network/ssl/qsslsocket_openssl_symbols_p.h
>-@@ -232,7 +232,7 @@ BIO *q_BIO_new_mem_buf(void *a, int b);
>- int q_BIO_read(BIO *a, void *b, int c);
>- Q_AUTOTEST_EXPORT int q_BIO_write(BIO *a, const void *b, int c);
>- int q_BN_num_bits(const BIGNUM *a);
>--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
>-+#if !defined(BN_is_word)
>- int q_BN_is_word(BIGNUM *a, BN_ULONG w);
>- #else
>- // BN_is_word is implemented purely as a
> @@ -454,6 +454,9 @@ void q_EC_KEY_free(EC_KEY *ecdh);
>  size_t q_EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);
>  #if OPENSSL_VERSION_NUMBER >= 0x10002000L

Actions: View | Diff

Attachments on bug 228344: 193533 | 193536 | 193559 | 193786 | 196989 | 196994 | 198438 | 198440 | 198490 | 198491 | 198600 | 198607 | 198610 | 198611 | 198618