[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master f0b5d4b: Simplify by assuming GnuTLS 2.12.2 or late
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master f0b5d4b: Simplify by assuming GnuTLS 2.12.2 or later |
Date: |
Wed, 3 Aug 2016 12:02:35 +0000 (UTC) |
branch: master
commit f0b5d4bd3e17bc0a464b9ec69507413824568f9e
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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.
---
src/gnutls.c | 3 ---
src/sysdep.c | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/gnutls.c b/src/gnutls.c
index bc35dfb..d242919 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 1654173..43ff0a1 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master f0b5d4b: Simplify by assuming GnuTLS 2.12.2 or later,
Paul Eggert <=