aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2014-11-25 16:13:10 +0100
committerLars Magne Ingebrigtsen2014-11-25 16:13:10 +0100
commit88871ef6112df666bdd334596b1ed420cc87ebaa (patch)
tree0d27543d5dfe3a62388b3df48f20679f9a1db108
parent63ca64241c057695aa5d5a189b3de6d8ada310b8 (diff)
downloademacs-88871ef6112df666bdd334596b1ed420cc87ebaa.tar.gz
emacs-88871ef6112df666bdd334596b1ed420cc87ebaa.zip
(gnutls_certificate_details): Reversed check in last checkin.
-rw-r--r--src/ChangeLog1
-rw-r--r--src/gnutls.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 067684ce491..a515080e85f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,7 @@
3 * gnutls.c (gnutls_certificate_details): Don't include certain 3 * gnutls.c (gnutls_certificate_details): Don't include certain
4 certificate details on older gnutls versions (bug#19168). 4 certificate details on older gnutls versions (bug#19168).
5 (syms_of_gnutls): Export gnutls_peer_status_warning_describe. 5 (syms_of_gnutls): Export gnutls_peer_status_warning_describe.
6 (gnutls_certificate_details): Reversed check in last checkin.
6 7
72014-11-25 Teodor Zlatanov <tzz@lifelogs.com> 82014-11-25 Teodor Zlatanov <tzz@lifelogs.com>
8 9
diff --git a/src/gnutls.c b/src/gnutls.c
index ff4399bec25..3b345a8c49b 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -864,7 +864,7 @@ gnutls_certificate_details (gnutls_x509_crt_t cert)
864 } 864 }
865 865
866 /* Versions older than 2.11 doesn't have these four functions. */ 866 /* Versions older than 2.11 doesn't have these four functions. */
867#if GNUTLS_VERSION_NUMBER < 0x020b00 867#if GNUTLS_VERSION_NUMBER >= 0x020b00
868 /* SubjectPublicKeyInfo. */ 868 /* SubjectPublicKeyInfo. */
869 { 869 {
870 unsigned int bits; 870 unsigned int bits;