Commit f0b5d4bd authored by Paul Eggert's avatar Paul Eggert
Browse files

Simplify by assuming GnuTLS 2.12.2 or later

* src/gnutls.c (gnutls_certificate_details):
* src/sysdep.c: Assume GnuTLS 2.12.2 or later.
parent 744cc9fa
...@@ -883,8 +883,6 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) ...@@ -883,8 +883,6 @@ gnutls_certificate_details (gnutls_x509_crt_t cert)
xfree (dn); xfree (dn);
} }
/* Versions older than 2.11 doesn't have these four functions. */
#if GNUTLS_VERSION_NUMBER >= 0x020b00
/* SubjectPublicKeyInfo. */ /* SubjectPublicKeyInfo. */
{ {
unsigned int bits; unsigned int bits;
...@@ -933,7 +931,6 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) ...@@ -933,7 +931,6 @@ gnutls_certificate_details (gnutls_x509_crt_t cert)
make_string (buf, buf_size))); make_string (buf, buf_size)));
xfree (buf); xfree (buf);
} }
#endif
/* Signature. */ /* Signature. */
err = gnutls_x509_crt_get_signature_algorithm (cert); err = gnutls_x509_crt_get_signature_algorithm (cert);
......
...@@ -95,7 +95,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -95,7 +95,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "gnutls.h" #include "gnutls.h"
/* MS-Windows loads GnuTLS at run time, if available; we don't want to /* MS-Windows loads GnuTLS at run time, if available; we don't want to
do that during startup just to call gnutls_rnd. */ do that during startup just to call gnutls_rnd. */
#if 0x020c00 <= GNUTLS_VERSION_NUMBER && !defined WINDOWSNT #ifndef WINDOWSNT
# include <gnutls/crypto.h> # include <gnutls/crypto.h>
#else #else
# define emacs_gnutls_global_init() Qnil # define emacs_gnutls_global_init() Qnil
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment