Changeset 7ef38d4 in mod_gnutls for src

Timestamp:

May 21, 2009, 2:48:34 PM (11 years ago)

Author:

Nokis Mavrogiannopoulos <nmav@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, msva, proxy-ticket, upstream

Children:

0e13d67

Parents:

8663ace

git-author:

Nikos Mavrogiannopoulos <nmav@…> (05/21/09 14:48:34)

git-committer:

Nokis Mavrogiannopoulos <nmav@…> (05/21/09 14:48:34)

Message:

if private key import fails try as pkcs8 key.

File:

• src/gnutls_config.c (modified) (1 diff)

src/gnutls_config.c

@@ -195 +195 @@
         gnutls_x509_privkey_import(sc->privkey_x509, &data,
                                    GNUTLS_X509_FMT_PEM);
-    if (ret != 0) {
+
+    if (ret < 0)
+        ret = gnutls_x509_privkey_import_pkcs8 (sc->privkey_x509, &data, GNUTLS_X509_FMT_PEM,
+                                                        NULL, GNUTLS_PKCS_PLAIN);
+
+    if (ret < 0) {
         return apr_psprintf(parms->pool, "GnuTLS: Failed to Import "
                             "Private Key '%s': (%d) %s", file, ret,