From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 3 Aug 2016 12:02:03 +0000 (-0400)
Subject: Simplify by assuming GnuTLS 2.12.2 or later
X-Git-Tag: emacs-26.0.90~1807
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f0b5d4bd3e17bc0a464b9ec69507413824568f9e;p=emacs.git

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.
---

diff --git a/src/gnutls.c b/src/gnutls.c
index bc35dfb4116..d242919270b 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -883,8 +883,6 @@ gnutls_certificate_details (gnutls_x509_crt_t cert)
       xfree (dn);
     }
 
-  /* Versions older than 2.11 doesn't have these four functions. */
-#if GNUTLS_VERSION_NUMBER >= 0x020b00
   /* SubjectPublicKeyInfo. */
   {
     unsigned int bits;
@@ -933,7 +931,6 @@ gnutls_certificate_details (gnutls_x509_crt_t cert)
 				  make_string (buf, buf_size)));
       xfree (buf);
     }
-#endif
 
   /* Signature. */
   err = gnutls_x509_crt_get_signature_algorithm (cert);
diff --git a/src/sysdep.c b/src/sysdep.c
index 16541735f03..43ff0a1e496 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -95,7 +95,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "gnutls.h"
 /* MS-Windows loads GnuTLS at run time, if available; we don't want to
    do that during startup just to call gnutls_rnd.  */
-#if 0x020c00 <= GNUTLS_VERSION_NUMBER && !defined WINDOWSNT
+#ifndef WINDOWSNT
 # include <gnutls/crypto.h>
 #else
 # define emacs_gnutls_global_init() Qnil