From: Oliver Graute <oliver.graute@gmail.com>
To: ptxdist@pengutronix.de
Cc: Oliver Graute <oliver.graute@neuhaus.de>
Subject: [ptxdist] [PATCH 4/4] renamed patch file
Date: Tue, 10 Feb 2015 16:52:37 +0100 [thread overview]
Message-ID: <1423583557-2560-5-git-send-email-oliver.graute@neuhaus.de> (raw)
In-Reply-To: <1423583557-2560-1-git-send-email-oliver.graute@neuhaus.de>
Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
---
...-enable-compilation-against-OpenSSL-1.0.1.patch | 42 ++++++++++++++++++++
...ix-to-enable-compilation-against-OpenSSL1.patch | 42 --------------------
patches/httpd-2.0.64/series | 2 +-
3 files changed, 43 insertions(+), 43 deletions(-)
create mode 100644 patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL-1.0.1.patch
delete mode 100644 patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL1.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;
diff --git a/patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL1.patch b/patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL1.patch
deleted file mode 100644
index 3841f64..0000000
--- a/patches/httpd-2.0.64/0005-fix-to-enable-compilation-against-OpenSSL1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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;
diff --git a/patches/httpd-2.0.64/series b/patches/httpd-2.0.64/series
index 075604c..3def16d 100644
--- a/patches/httpd-2.0.64/series
+++ b/patches/httpd-2.0.64/series
@@ -4,5 +4,5 @@
0002-HACK-srclib-pcre-Makefile-fallback-to-dftables-from-.patch
0003-HACK-support-apxs-don-t-execute-httpd.patch
0004-HACK-support-apxs-don-t-try-to-modify-the-config-fil.patch
-0005-fix-to-enable-compilation-against-OpenSSL1.patch
+0005-fix-to-enable-compilation-against-OpenSSL-1.0.1.patch
# 160b9c105b4f55538cd0ce5c82eda8fd - git-ptx-patches magic
--
1.7.9.5
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2015-02-10 15:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-10 15:52 [ptxdist] [PATCH 1/4] apache2: added fix-to-enable-compilation-against-OpenSSL1 Oliver Graute
2015-02-10 15:52 ` [ptxdist] [PATCH 2/4] added --with-ssl and --enabled-ssl option Oliver Graute
2015-02-10 16:28 ` Marc Kleine-Budde
2015-02-10 15:52 ` [ptxdist] [PATCH 3/4] copy mod_ssl.so to right dir Oliver Graute
2015-02-10 15:52 ` Oliver Graute
2015-02-10 15:52 ` Oliver Graute [this message]
2015-02-10 16:27 ` [ptxdist] [PATCH 4/4] renamed patch file Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1423583557-2560-5-git-send-email-oliver.graute@neuhaus.de \
--to=oliver.graute@gmail.com \
--cc=oliver.graute@neuhaus.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox