*** empty log message ***

diff --git a/NEWS b/NEWS
index b8902333c32d35fc299cdc84de3cfa65789044e0..24aa32921e778080084d11dab1ed25c21dbe68b8 100644 (file)
--- 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 391805a7b9462f817f5eba5b8a2ec74be8860292..3bf0c2d18baf59cb2ea994414d3b3457f4bd3e21 100644 (file)
--- 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();