doc: minor fixes [ci skip]

Created NEWS entry for 3.6.6 and unified the listing of gnutls_init_flags_t
items.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

diff --git a/NEWS b/NEWS
index b55cd07be5919e4d75be7360da4a69b0696529a7..4cab2d1e726d7540c91291a23a63e1d74da9b967 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,18 @@ Copyright (C) 2000-2016 Free Software Foundation, Inc.
 Copyright (C) 2013-2017 Nikos Mavrogiannopoulos
 See the end for copying conditions.
 
+* Version 3.6.6 (unreleased)
+
+** libgnutls: Added support for raw public-key authentication as defined in RFC7250.
+   Raw public-keys can be negotiated by enabling the corresponding certificate
+   types via the priority strings. The raw public-key mechanism must be explicitly
+   enabled via the GNUTLS_ENABLE_RAWPK init flag.
+
+** API and ABI modifications:
+GNUTLS_ENABLE_RAWPK: Added
+GNUTLS_ENABLE_CERT_TYPE_NEG: Removed (was no-op; replaced by GNUTLS_ENABLE_RAWPK) 
+
+
 * Version 3.6.5 (released 2018-12-01)
 
 ** libgnutls: Provide the option of transparent re-handshake/reauthentication
@@ -53,11 +65,6 @@ See the end for copying conditions.
 ** certtool: Add parameter --no-text that prevents certtool from outputting
    text before PEM-encoded private key, public key, certificate, CRL or CSR.
 
-** libgnutls: Added support for raw public-key authentication as defined in RFC7250.
-   Raw public-keys can be negotiated by enabling the corresponding certificate
-   types via the priority strings. The raw public-key mechanism must be explicitly
-   enabled via the GNUTLS_ENABLE_RAWPK init flag.
-
 ** API and ABI modifications:
 GNUTLS_AUTO_REAUTH: Added
 GNUTLS_CIPHER_AES_128_CFB8: Added
@@ -65,8 +72,6 @@ GNUTLS_CIPHER_AES_192_CFB8: Added
 GNUTLS_CIPHER_AES_256_CFB8: Added
 GNUTLS_MAC_AES_CMAC_128: Added
 GNUTLS_MAC_AES_CMAC_256: Added
-GNUTLS_ENABLE_RAWPK: Added
-GNUTLS_ENABLE_CERT_TYPE_NEG: Removed
 gnutls_record_get_max_early_data_size: Added
 gnutls_record_send_early_data: Added
 gnutls_record_recv_early_data: Added

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 1c3455c0cf6bdaf8fcd4eb9399b51831ba11a8e3..7e6a592447924d39880fd78fd88917f520cda4bb 100644 (file)
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -431,7 +431,6 @@ typedef enum {
  *    in different threads.
  * @GNUTLS_ENABLE_EARLY_DATA: Under TLS1.3 allow the server to receive early data sent as part of the initial ClientHello (0-RTT). 
  *    This is not enabled by default as early data has weaker security properties than other data. Since 3.6.5.
- * 
  * @GNUTLS_ENABLE_RAWPK: Allows raw public-keys to be negotiated during the handshake. Since 3.6.6.
  *
  * Enumeration of different flags for gnutls_init() function. All the flags