Changeset e376ed8 in mod_gnutls for configure.ac

Timestamp:

Nov 29, 2019, 4:30:08 PM (12 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master, proxy-ticket

Children:

618ee14

Parents:

d4c9331 (diff), 556783e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'subca'

File:

• configure.ac (modified) (2 diffs)

configure.ac

@@ -46 +46 @@
         ], [])
 
-PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.3.0])
+PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.6.3])
 
 LIBGNUTLS_VERSION=`pkg-config --modversion gnutls`
@@ -133 +133 @@
 # openssl is needed as the responder for OCSP tests
 AC_PATH_PROG([OPENSSL], [openssl], [no])
-# OCSP checks with gnutls-cli from GnuTLS versions before 3.3.23,
-# 3.4.12, or 3.5.1 (on the respective 3.x branch) fail if intermediate
-# CAs cannot be status checked, even if there are no intermediate CAs
-# like in the mod_gnutls test suite where end entity certificates are
-# directly issued by a root CA.
-AC_MSG_CHECKING([for gnutls-cli version supporting OCSP for EE under root CA])
-AC_PREPROC_IFELSE(
-        [AC_LANG_SOURCE([[#include "gnutls/gnutls.h"
-                        #if GNUTLS_VERSION_NUMBER < 0x030317
-                        #error
-                        #elif GNUTLS_VERSION_NUMBER >= 0x030400 && GNUTLS_VERSION_NUMBER < 0x03040c
-                        #error
-                        #elif GNUTLS_VERSION_NUMBER == 0x030500
-                        #error
-                        #endif
-                        ]])],
-        [gnutls_ocsp_ok="yes"],
-        [gnutls_ocsp_ok="no"],
-)
-AC_MSG_RESULT([$gnutls_ocsp_ok])
-AM_CONDITIONAL([ENABLE_OCSP_TEST], [test "${OPENSSL}" != "no" && test "${gnutls_ocsp_ok}" = "yes"])
+AM_CONDITIONAL([ENABLE_OCSP_TEST], [test "${OPENSSL}" != "no"])
 
 dnl Enable test namespaces? Default is "yes".