summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--lib/x509/x509_write.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index b8902333c3..24aa32921e 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ Copyright (C) 2000, 2001, 2002, 2003, 2004 Nikos Mavroyanopoulos
See the end for copying conditions.
* Version 1.2.2
+- gnutls_error_to_alert() now considers
+ GNUTLS_E_UNEXPECTED_HANDSHAKE_PACKET.
* Version 1.2.1 (2005-04-04)
- gnutls_bye() will no longer fail when RDWR is used and application
diff --git a/lib/x509/x509_write.c b/lib/x509/x509_write.c
index 391805a7b9..3bf0c2d18b 100644
--- a/lib/x509/x509_write.c
+++ b/lib/x509/x509_write.c
@@ -248,7 +248,7 @@ int gnutls_x509_crt_set_extension_by_oid(gnutls_x509_crt_t crt,
unsigned int critical)
{
int result;
- gnutls_datum_t der_data = {buf, sizeof_buf};
+ gnutls_datum_t der_data = {(void*)buf, sizeof_buf};
if (crt == NULL) {
gnutls_assert();