textproc/wkhtmltopdf: we have RSA_bits(), so don't patch it out
This commit is contained in:
tb
parent
9ce728a015
commit
ff09fafd31
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.26 2021/10/31 17:36:08 tb Exp $
|
||||
# $OpenBSD: Makefile,v 1.27 2021/11/22 09:51:02 tb Exp $
|
||||
|
||||
ONLY_FOR_ARCHS = amd64 i386
|
||||
USE_WXNEEDED = Yes
|
||||
@ -14,7 +14,7 @@ QT_COMMIT = 5db36ec76b29712eb2c5bd0625c2c77d7468b3fc
|
||||
MASTER_SITES0 = https://github.com/wkhtmltopdf/qt/archive/
|
||||
DISTFILES = ${DISTNAME}.tar.gz \
|
||||
wkhtmltopdf-qt-${QT_COMMIT}_1{${QT_COMMIT}}.tar.gz:0
|
||||
REVISION = 4
|
||||
REVISION = 5
|
||||
|
||||
SHARED_LIBS = wkhtmltox 1.0 # 0.12
|
||||
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
$OpenBSD: patch-qt_src_network_ssl_qsslkey_cpp,v 1.1 2018/07/24 12:03:11 sthen Exp $
|
||||
|
||||
Index: qt/src/network/ssl/qsslkey.cpp
|
||||
--- qt/src/network/ssl/qsslkey.cpp.orig
|
||||
+++ qt/src/network/ssl/qsslkey.cpp
|
||||
@@ -321,19 +321,8 @@ int QSslKey::length() const
|
||||
{
|
||||
if (d->isNull)
|
||||
return -1;
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
return (d->algorithm == QSsl::Rsa)
|
||||
? q_BN_num_bits(d->rsa->n) : q_BN_num_bits(d->dsa->p);
|
||||
-#else
|
||||
- if (d->algorithm == QSsl::Rsa) {
|
||||
- return q_RSA_bits(d->rsa);
|
||||
- }else{
|
||||
- const BIGNUM *p = NULL;
|
||||
- q_DSA_get0_pqg(d->dsa, &p, NULL, NULL);
|
||||
- return q_BN_num_bits(p);
|
||||
- }
|
||||
-#endif
|
||||
-
|
||||
}
|
||||
|
||||
/*!
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-qt_src_network_ssl_qsslsocket_openssl_symbols_cpp,v 1.5 2021/10/31 17:36:08 tb Exp $
|
||||
$OpenBSD: patch-qt_src_network_ssl_qsslsocket_openssl_symbols_cpp,v 1.6 2021/11/22 09:51:02 tb Exp $
|
||||
|
||||
Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
--- qt/src/network/ssl/qsslsocket_openssl_symbols.cpp.orig
|
||||
@ -57,7 +57,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
#endif
|
||||
DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return)
|
||||
#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
@@ -336,15 +325,11 @@ DEFINEFUNC(unsigned long, OpenSSL_version_num, void, D
|
||||
@@ -336,15 +325,12 @@ DEFINEFUNC(unsigned long, OpenSSL_version_num, void, D
|
||||
DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *ctx, ctx, return 0, return)
|
||||
|
||||
DEFINEFUNC(ASN1_INTEGER *, X509_get_serialNumber, X509 *x, x, return 0, return)
|
||||
@ -68,12 +68,12 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
-DEFINEFUNC2(long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, long options, options, return 0, return)
|
||||
DEFINEFUNC(long, X509_get_version, X509 *x, x, return 0, return)
|
||||
DEFINEFUNC(X509_PUBKEY *, X509_get_X509_PUBKEY, X509 *x, x, return 0, return)
|
||||
-DEFINEFUNC(int, RSA_bits, const RSA *rsa, rsa, return 0, return)
|
||||
DEFINEFUNC(int, RSA_bits, const RSA *rsa, rsa, return 0, return)
|
||||
-DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return)
|
||||
#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
DEFINEFUNC(ASN1_TIME *, X509_get_notAfter, X509 *x, x, return 0, return)
|
||||
DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x, return 0, return)
|
||||
@@ -353,7 +338,6 @@ DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, X509 *x, x
|
||||
@@ -353,7 +339,6 @@ DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, X509 *x, x
|
||||
DEFINEFUNC(ASN1_TIME *, X509_getm_notBefore, X509 *x, x, return 0, return)
|
||||
#endif
|
||||
DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, const BIGNUM **p, p, const BIGNUM **q, q, const BIGNUM **g, g, return, return)
|
||||
@ -81,7 +81,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
|
||||
#ifdef Q_OS_SYMBIAN
|
||||
#define RESOLVEFUNC(func, ordinal, lib) \
|
||||
@@ -823,11 +807,9 @@ bool q_resolveOpenSslSymbols()
|
||||
@@ -823,11 +808,9 @@ bool q_resolveOpenSslSymbols()
|
||||
RESOLVEFUNC(BIO_write)
|
||||
RESOLVEFUNC(BN_num_bits)
|
||||
RESOLVEFUNC(CRYPTO_free)
|
||||
@ -93,7 +93,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
RESOLVEFUNC(DSA_free)
|
||||
RESOLVEFUNC(ERR_error_string)
|
||||
RESOLVEFUNC(ERR_get_error)
|
||||
@@ -857,17 +839,10 @@ bool q_resolveOpenSslSymbols()
|
||||
@@ -857,17 +840,10 @@ bool q_resolveOpenSslSymbols()
|
||||
RESOLVEFUNC(RAND_seed)
|
||||
RESOLVEFUNC(RAND_status)
|
||||
RESOLVEFUNC(RSA_free)
|
||||
@ -111,7 +111,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
RESOLVEFUNC(SSL_CIPHER_description)
|
||||
RESOLVEFUNC(SSL_CTX_check_private_key)
|
||||
RESOLVEFUNC(SSL_CTX_ctrl)
|
||||
@@ -911,16 +886,12 @@ bool q_resolveOpenSslSymbols()
|
||||
@@ -911,16 +887,13 @@ bool q_resolveOpenSslSymbols()
|
||||
RESOLVEFUNC(SSL_write)
|
||||
|
||||
RESOLVEFUNC(X509_get_serialNumber)
|
||||
@ -123,12 +123,12 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
- RESOLVEFUNC(SSL_CTX_set_options)
|
||||
RESOLVEFUNC(X509_get_version)
|
||||
RESOLVEFUNC(X509_get_X509_PUBKEY)
|
||||
- RESOLVEFUNC(RSA_bits)
|
||||
RESOLVEFUNC(RSA_bits)
|
||||
- RESOLVEFUNC(DSA_security_bits)
|
||||
RESOLVEFUNC(DSA_get0_pqg)
|
||||
#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
RESOLVEFUNC(X509_get_notAfter)
|
||||
@@ -929,8 +900,6 @@ bool q_resolveOpenSslSymbols()
|
||||
@@ -929,8 +902,6 @@ bool q_resolveOpenSslSymbols()
|
||||
RESOLVEFUNC(X509_getm_notAfter)
|
||||
RESOLVEFUNC(X509_getm_notBefore)
|
||||
#endif
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p_h,v 1.4 2021/10/31 17:36:08 tb Exp $
|
||||
$OpenBSD: patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p_h,v 1.5 2021/11/22 09:51:02 tb Exp $
|
||||
|
||||
Index: qt/src/network/ssl/qsslsocket_openssl_symbols_p.h
|
||||
--- qt/src/network/ssl/qsslsocket_openssl_symbols_p.h.orig
|
||||
@ -55,7 +55,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols_p.h
|
||||
#define q_SSL_library_init() q_OPENSSL_init_ssl(0, NULL)
|
||||
#define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
|
||||
#endif
|
||||
@@ -446,24 +428,15 @@ DSA *q_d2i_DSAPrivateKey(DSA **a, unsigned char **pp,
|
||||
@@ -446,24 +428,16 @@ DSA *q_d2i_DSAPrivateKey(DSA **a, unsigned char **pp,
|
||||
PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_DSAPrivateKey,PEM_STRING_DSA,\
|
||||
bp,(char *)x,enc,kstr,klen,cb,u)
|
||||
#endif
|
||||
@ -73,14 +73,14 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols_p.h
|
||||
-long q_SSL_CTX_set_options(SSL_CTX *ctx, long options);
|
||||
long q_X509_get_version(X509 *x);
|
||||
X509_PUBKEY * q_X509_get_X509_PUBKEY(X509 *x);
|
||||
-int q_RSA_bits(const RSA *rsa);
|
||||
int q_RSA_bits(const RSA *rsa);
|
||||
-int q_DSA_security_bits(const DSA *dsa);
|
||||
void q_DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
|
||||
-#endif
|
||||
|
||||
#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
|
||||
#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
|
||||
@@ -499,7 +472,7 @@ ASN1_TIME *q_X509_getm_notBefore(X509 *x);
|
||||
@@ -499,7 +473,7 @@ ASN1_TIME *q_X509_getm_notBefore(X509 *x);
|
||||
void q_OPENSSL_add_all_algorithms_noconf();
|
||||
void q_OPENSSL_add_all_algorithms_conf();
|
||||
#else
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user