Changeset 52149ee in mod_gnutls for src

Timestamp:

Oct 1, 2008, 12:06:35 PM (11 years ago)

Author:

Nokis Mavrogiannopoulos <nmav@…>

Branches:

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

Children:

7ca474b

Parents:

a208cd3

git-author:

Nikos Mavrogiannopoulos <nmav@…> (10/01/08 12:06:35)

git-committer:

Nokis Mavrogiannopoulos <nmav@…> (10/01/08 12:06:35)

Message:

Allow openpgp-only sites

File:

• src/gnutls_hooks.c (modified) (2 diffs)

src/gnutls_hooks.c

@@ -410 +410 @@
 #endif
 
-            if (sc->certs_x509[0] == NULL
-                && sc->enabled == GNUTLS_ENABLED_TRUE) {
+            if (sc->certs_x509[0] == NULL &&
+                sc->cert_pgp == NULL &&
+                sc->enabled == GNUTLS_ENABLED_TRUE) {
                 ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
                              "[GnuTLS] - Host '%s:%d' is missing a "
@@ -419 +420 @@
             }
 
-            if (sc->privkey_x509 == NULL
-                && sc->enabled == GNUTLS_ENABLED_TRUE) {
+            if (sc->enabled == GNUTLS_ENABLED_TRUE && 
+              ((sc->certs_x509[0] != NULL && sc->privkey_x509 == NULL) ||
+              (sc->cert_pgp != NULL && sc->privkey_pgp == NULL))) {
                 ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
                              "[GnuTLS] - Host '%s:%d' is missing a "