From d3739fec5304e39defa90d200222add58fd79b30 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Tue, 25 Nov 2014 16:04:47 +0100 Subject: [PATCH] Make gnutls.c compile on older gnutls installations * gnutls.c (gnutls_certificate_details): Don't include certain certificate details on older gnutls versions (bug#19168). (syms_of_gnutls): Export gnutls_peer_status_warning_describe. --- src/ChangeLog | 6 ++++++ src/gnutls.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index d78e1cd49eb..067684ce491 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-11-25 Lars Magne Ingebrigtsen + + * gnutls.c (gnutls_certificate_details): Don't include certain + certificate details on older gnutls versions (bug#19168). + (syms_of_gnutls): Export gnutls_peer_status_warning_describe. + 2014-11-25 Teodor Zlatanov * gnutls.c (Fgnutls_peer_status): Check GNUTLS_INITSTAGE, not gnutls_p. diff --git a/src/gnutls.c b/src/gnutls.c index 8268901265b..ff4399bec25 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -863,6 +863,8 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) } } + /* Versions older than 2.11 doesn't have these four functions. */ +#if GNUTLS_VERSION_NUMBER < 0x020b00 /* SubjectPublicKeyInfo. */ { unsigned int bits; @@ -906,6 +908,7 @@ gnutls_certificate_details (gnutls_x509_crt_t cert) free (buf); } } +#endif /* Signature. */ { @@ -1585,6 +1588,7 @@ syms_of_gnutls (void) defsubr (&Sgnutls_bye); defsubr (&Sgnutls_available_p); defsubr (&Sgnutls_peer_status); + defsubr (&Sgnutls_peer_status_warning_describe); DEFVAR_INT ("gnutls-log-level", global_gnutls_log_level, doc: /* Logging level used by the GnuTLS functions. -- 2.39.5