[ptxdist] [PATCHv2 1/4] apache2: This patch enable compilation against openssl-1.0.1k

[Oliver Graute <oliver.graute@gmail.com>]

This patch enable compilation against openssl-1.0.1k
This patch add the module mod_ssl.so 

Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
---
 ...-enable-compilation-against-OpenSSL-1.0.1.patch |   42 ++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL-1.0.1.patch

diff --git a/patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL-1.0.1.patch b/patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL-1.0.1.patch
new file mode 100644
index 0000000..3841f64
--- /dev/null
+++ b/patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL-1.0.1.patch
@@ -0,0 +1,42 @@
+diff -rupN AI/modules/ssl/ssl_engine_init.c AJ/modules/ssl/ssl_engine_init.c
+--- AI/modules/ssl/ssl_engine_init.c	2010-09-28 17:59:13.000000000 +0200
++++ AJ/modules/ssl/ssl_engine_init.c	2015-02-09 09:46:29.026472658 +0100
+@@ -535,7 +535,7 @@ static void ssl_init_ctx_verify(server_r
+             ssl_die();
+         }
+ 
+-        SSL_CTX_set_client_CA_list(ctx, (STACK *)ca_list);
++        SSL_CTX_set_client_CA_list(ctx, (STACK_OF(X509_NAME) *)ca_list);
+     }
+ 
+     /*
+diff -rupN AI/modules/ssl/ssl_util_ssl.c AJ/modules/ssl/ssl_util_ssl.c
+--- AI/modules/ssl/ssl_util_ssl.c	2015-02-09 10:07:36.419935328 +0100
++++ AJ/modules/ssl/ssl_util_ssl.c	2015-02-09 10:10:04.183924609 +0100
+@@ -291,7 +291,7 @@ BOOL SSL_X509_isSGC(X509 *cert)
+ #ifdef HAVE_SSL_X509V3_EXT_d2i
+     X509_EXTENSION *ext;
+     int ext_nid;
+-    STACK *sk;
++    STACK_OF(SSL_CIPHER) *sk;
+     BOOL is_sgc;
+     int idx;
+     int i;
+@@ -300,7 +300,7 @@ BOOL SSL_X509_isSGC(X509 *cert)
+     idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1);
+     if (idx >= 0) {
+         ext = X509_get_ext(cert, idx);
+-        if ((sk = (STACK *)X509V3_EXT_d2i(ext)) != NULL) {
++        if ((sk = X509V3_EXT_d2i(ext)) != NULL) {
+             for (i = 0; i < sk_num(sk); i++) {
+                 ext_nid = OBJ_obj2nid((ASN1_OBJECT *)sk_value(sk, i));
+                 if (ext_nid == NID_ms_sgc || ext_nid == NID_ns_sgc) {
+@@ -466,7 +466,7 @@ int SSL_CTX_use_certificate_chain(
+     X509 *x509;
+     unsigned long err;
+     int n;
+-    STACK *extra_certs;
++    STACK_OF(X509) *extra_certs;
+ 
+     if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
+         return -1;
-- 
1.7.9.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de