[BACK]Return to patch-bb CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / www / apache22 / patches

File: [cvs.NetBSD.org] / pkgsrc / www / apache22 / patches / Attic / patch-bb (download)

Revision 1.3, Thu Aug 6 08:21:44 2009 UTC (5 years, 2 months ago) by tron
Branch: MAIN
Branch point for: pkgsrc-2009Q2
Changes since 1.2: +31 -15 lines

Add patches provided by Adam Ciarcinski to fix build with recent versions
of OpenSSL (e.g. the version in NetBSD-current).

$NetBSD: patch-bb,v 1.3 2009/08/06 08:21:44 tron Exp $

Fix build problems with newer versions of OpenSSL.

--- modules/ssl/ssl_util_ssl.c.orig	2009-08-05 09:33:37.000000000 +0200
+++ modules/ssl/ssl_util_ssl.c
@@ -294,7 +294,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;
@@ -303,7 +303,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) {
@@ -467,7 +467,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;