aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2016-08-03 08:02:03 -0400
committerPaul Eggert2016-08-03 08:02:31 -0400
commitf0b5d4bd3e17bc0a464b9ec69507413824568f9e (patch)
tree674b3b424ace1c76929235ae7cdaacb920a475c4 /src
parent744cc9fa17d20450fc3cf1ca6bb71869abeeb77b (diff)
downloademacs-f0b5d4bd3e17bc0a464b9ec69507413824568f9e.tar.gz
emacs-f0b5d4bd3e17bc0a464b9ec69507413824568f9e.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/gnutls.c3
-rw-r--r--src/sysdep.c2
2 files changed, 1 insertions, 4 deletions
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)
883 xfree (dn); 883 xfree (dn);
884 } 884 }
885 885
886 /* Versions older than 2.11 doesn't have these four functions. */
887#if GNUTLS_VERSION_NUMBER >= 0x020b00
888 /* SubjectPublicKeyInfo. */ 886 /* SubjectPublicKeyInfo. */
889 { 887 {
890 unsigned int bits; 888 unsigned int bits;
@@ -933,7 +931,6 @@ gnutls_certificate_details (gnutls_x509_crt_t cert)
933 make_string (buf, buf_size))); 931 make_string (buf, buf_size)));
934 xfree (buf); 932 xfree (buf);
935 } 933 }
936#endif
937 934
938 /* Signature. */ 935 /* Signature. */
939 err = gnutls_x509_crt_get_signature_algorithm (cert); 936 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/>. */
95#include "gnutls.h" 95#include "gnutls.h"
96/* MS-Windows loads GnuTLS at run time, if available; we don't want to 96/* MS-Windows loads GnuTLS at run time, if available; we don't want to
97 do that during startup just to call gnutls_rnd. */ 97 do that during startup just to call gnutls_rnd. */
98#if 0x020c00 <= GNUTLS_VERSION_NUMBER && !defined WINDOWSNT 98#ifndef WINDOWSNT
99# include <gnutls/crypto.h> 99# include <gnutls/crypto.h>
100#else 100#else
101# define emacs_gnutls_global_init() Qnil 101# define emacs_gnutls_global_init() Qnil