x11/qt4-libs/patches/patch-ba

   1 $NetBSD: patch-ba,v 1.2 2009/10/01 13:30:42 drochner Exp $
   2
   3 --- src/network/ssl/qsslcertificate.cpp.orig    2009-06-20 06:57:57.000000000 +0200
   4 +++ src/network/ssl/qsslcertificate.cpp
   5 @@ -362,7 +362,7 @@ QMultiMap<QSsl::AlternateNameEntryType,
   6      if (!d->x509)
   7          return result;
   8
   9 -    STACK *altNames = (STACK *)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0);
  10 +    STACK_OF(GENERAL_NAME) *altNames = (STACK_OF(GENERAL_NAME) *)q_X509_get_ext_d2i(d->x509, NID_subject_alt_name, 0, 0);
  11
  12      if (altNames) {
  13          for (int i = 0; i < q_sk_GENERAL_NAME_num(altNames); ++i) {
  14 @@ -377,7 +377,7 @@ QMultiMap<QSsl::AlternateNameEntryType,
  15              }
  16
  17              const char *altNameStr = reinterpret_cast<const char *>(q_ASN1_STRING_data(genName->d.ia5));
  18 -            const QString altName = QLatin1String(QByteArray(altNameStr, len));
  19 +            const QString altName = QString::fromLatin1(altNameStr, len);
  20              if (genName->type == GEN_DNS)
  21                  result.insert(QSsl::DnsEntry, altName);
  22              else if (genName->type == GEN_EMAIL)