summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2011-08-15 22:30:16 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2011-08-15 22:31:42 +0200
commitee28e7f972c93eaf5f3c7513908e094c989b2afb (patch)
treeadea83317f5e5d73169264a69d37ced6f61cd732
parentb5d1d49215c4892c933ec21ba86f3e0483639a1f (diff)
downloadgnutls-ee28e7f972c93eaf5f3c7513908e094c989b2afb.tar.gz
Replaced typedef gnutls_connection_end_t from openssl.h with an unsigned int.
-rw-r--r--NEWS4
-rw-r--r--libextra/includes/gnutls/openssl.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index b730ca3a77..7f292d7198 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@ See the end for copying conditions.
* Version 2.12.9 (unreleased)
+** libgnutls-extra: Replaced enumeration with unsigned
+int, in openssl.h to make it identical to the 3.0.0 version.
+This shouldn't introduce binary incompatibility.
+
** libgnutls: When asking for a PIN multiple times, the
flags in the callback were not being updated to reflect
for PIN low count or final try.
diff --git a/libextra/includes/gnutls/openssl.h b/libextra/includes/gnutls/openssl.h
index 7ea8b7c30b..86ae199b02 100644
--- a/libextra/includes/gnutls/openssl.h
+++ b/libextra/includes/gnutls/openssl.h
@@ -100,7 +100,7 @@ extern "C"
typedef struct
{
char priority_string[256];
- gnutls_connection_end_t connend;
+ unsigned int connend;
} SSL_METHOD;
typedef struct