Re: openssl breakage: apache2, kdelibs3, mutt-devel

[Thomas Klausner <wiz%NetBSD.org@localhost>]

On Thu, Aug 27, 2009 at 07:34:47AM +0900, Takahiro Kambe wrote:
> In message <20090826221929.GS25788%danbala.tuwien.ac.at@localhost>
>       on Thu, 27 Aug 2009 00:19:29 +0200,
>       Thomas Klausner <wiz%danbala.tuwien.ac.at@localhost> wrote:
> > Thank you. But this one's not sufficient, there are more errors:
> > 
> > mutt_ssl.c: In function 'check_host':
> > mutt_ssl.c:676: error: incompatible types in assignment
> > mutt_ssl.c:678: error: type mismatch in conditional expression
> > mutt_ssl.c:681: error: type mismatch in conditional expression
> > mutt_ssl.c: In function 'ssl_cache_trusted_cert':
> > mutt_ssl.c:738: warning: assignment from incompatible pointer type
> > *** [mutt_ssl.o] Error code 1
> >  Thomas
> Replace sk_new_null() with sk_X509_new_null() may help.

It does! Attached version compiles. Ok to commit?
 Thomas

$NetBSD$

--- mutt_ssl.c.orig     2009-06-10 05:08:29.000000000 +0000
+++ mutt_ssl.c
@@ -652,7 +652,7 @@ static int check_host (X509 *x509cert, c
   char *buf = NULL;
   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? */
@@ -735,7 +735,7 @@ static int ssl_cache_trusted_cert (X509 
 {
   dprint (1, (debugfile, "trusted: %s\n", c->name));
   if (!SslSessionCerts)
-    SslSessionCerts = sk_new_null();
+    SslSessionCerts = sk_X509_new_null();
   return (sk_X509_push (SslSessionCerts, X509_dup(c)));
 }