[packages] nzbget: fix compilation against OpenSSL v1.x (#8893)
git-svn-id: svn://svn.openwrt.org/openwrt/packages@25606 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
69b9883fb8
commit
87ad846602
32
net/nzbget/patches/001-openssl-1.0.0-compat.patch
Normal file
32
net/nzbget/patches/001-openssl-1.0.0-compat.patch
Normal file
@ -0,0 +1,32 @@
|
||||
--- a/TLS.cpp
|
||||
+++ b/TLS.cpp
|
||||
@@ -908,7 +908,7 @@ int tls_check_cert(tls_t *tls, const cha
|
||||
char *buf;
|
||||
int bufsize;
|
||||
/* needed to get the DNS subjectAltNames: */
|
||||
- STACK *subj_alt_names;
|
||||
+ STACK_OF(GENERAL_NAME) *subj_alt_names;
|
||||
int subj_alt_names_count;
|
||||
GENERAL_NAME *subj_alt_name;
|
||||
/* did we find a name matching hostname? */
|
||||
@@ -960,7 +960,7 @@ int tls_check_cert(tls_t *tls, const cha
|
||||
/* Try the DNS subjectAltNames. */
|
||||
match_found = 0;
|
||||
if ((subj_alt_names =
|
||||
- (STACK*)X509_get_ext_d2i(x509cert, NID_subject_alt_name, NULL, NULL)))
|
||||
+ (STACK_OF(GENERAL_NAME) *)X509_get_ext_d2i(x509cert, NID_subject_alt_name, NULL, NULL)))
|
||||
{
|
||||
subj_alt_names_count = sk_GENERAL_NAME_num(subj_alt_names);
|
||||
for (i = 0; i < subj_alt_names_count; i++)
|
||||
@@ -1105,7 +1105,11 @@ int tls_init(tls_t *tls, const char *key
|
||||
|
||||
#ifdef HAVE_OPENSSL
|
||||
|
||||
+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
||||
+ const SSL_METHOD *ssl_method = NULL;
|
||||
+ #else
|
||||
SSL_METHOD *ssl_method = NULL;
|
||||
+ #endif
|
||||
|
||||
ssl_method = force_sslv3 ? SSLv3_client_method() : SSLv23_client_method();
|
||||
if (!ssl_method)
|
Loading…
x
Reference in New Issue
Block a user