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.
This commit is contained in:
Paul Eggert 2016-08-03 08:02:03 -04:00
parent 744cc9fa17
commit f0b5d4bd3e
2 changed files with 1 additions and 4 deletions

View file

@ -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);

View file

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