opensourcemirror
/
cockpit
mirror of https://github.com/cockpit-project/cockpit.git
1
0
Fork 0
Code Issues Releases Wiki Activity

tls: depend on GnuTLS 3.6 

..and drop a piece of dead code.
This commit is contained in:
Allison Karlitskaya 2021-03-25 10:11:41 +01:00 committed by Martin Pitt
parent 2064a4f78a
commit 22b6ff27da
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -74,7 +74,7 @@ GIO_REQUIREMENT="gio-unix-2.0 >= $GLIB_VERSION gio-2.0 >= $GLIB_VERSION"
LIBSYSTEMD_REQUIREMENT="libsystemd >= 235"
JSON_GLIB_REQUIREMENT="json-glib-1.0 >= 1.4"
POLKIT_REQUIREMENT="polkit-agent-1 >= 0.105"
GNUTLS_REQUIREMENT="gnutls >= 3.4.3"
GNUTLS_REQUIREMENT="gnutls >= 3.6.0"
KRB5_REQUIREMENT="krb5-gssapi >= 1.11 krb5 >= 1.11"
PKG_CHECK_MODULES(GIO, [$GIO_REQUIREMENT])

5
src/tls/connection.c
View File

@ -928,11 +928,6 @@ connection_crypto_init (const char *certfile,
gnutls_certificate_set_verify_function (parameters.x509_cred, verify_peer_certificate);
#if GNUTLS_VERSION_NUMBER >= 0x030506 && GNUTLS_VERSION_NUMBER <= 0x030600
/* only available since GnuTLS 3.5.6, and deprecated in 3.6 */
gnutls_certificate_set_known_dh_params (parameters.x509_cred, GNUTLS_SEC_PARAM_MEDIUM);
#endif
parameters.request_mode = request_mode;
}