Changeset f4deac5 in mod_gnutls

Timestamp:

Jul 5, 2017, 1:16:09 PM (6 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, main, master, proxy-ticket, upstream

Children:

b8b1990

Parents:

bd6591f

Message:

Warn users about OpenPGP deprecation

OpenPGP support has been deprecated in GnuTLS since version 3.5.9 and
has already been removed completely on the git master branch.

Files:

• doc/mod_gnutls_manual.mdwn (modified) (1 diff)
• src/gnutls_hooks.c (modified) (1 diff)

doc/mod_gnutls_manual.mdwn

@@ -360 +360 @@
 OpenPGP Certificate Authentication
 ----------------------------------
+
+*Warning:* OpenPGP support has been deprecated in GnuTLS since version
+3.5.9 and will be removed completely. Consequently, OpenPGP support in
+`mod_gnutls` is deprecated as well and will be removed in a future
+release.
 
 ### GnuTLSPGPCertificateFile

src/gnutls_hooks.c

@@ -610 +610 @@
             return HTTP_UNAUTHORIZED;
         }
+
+        /* If OpenPGP support is already disabled in the loaded GnuTLS
+         * library startup will fail if the configuration tries to
+         * load PGP credentials. Otherwise warn affected users about
+         * deprecation. */
+        if (sc->pgp_cert_file || sc->pgp_key_file || sc->pgp_ring_file)
+            ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
+                         "Host '%s:%d' is configured to use OpenPGP auth. "
+                         "OpenPGP support has been deprecated in GnuTLS "
+                         "since version 3.5.9 and will be removed from "
+                         "mod_gnutls in a future release.",
+                         s->server_hostname, s->port);
 
         if (sc->enabled == GNUTLS_ENABLED_TRUE) {