From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 16 Nov 2010 14:23:46 +0000 (+0100)
Subject: Deprecated the key derivation method from netconf. The published
X-Git-Tag: gnutls_2_11_5~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3557668d5ca189e472d5fbf86bde5ec45167d44e;p=thirdparty%2Fgnutls.git

Deprecated the key derivation method from netconf. The published
RFC does not include this method and it is not known whether it has
been used at all in practice. No need to support it.
---

diff --git a/doc/cha-auth.texi b/doc/cha-auth.texi
index 95517916bb..42fe4ec2c6 100644
--- a/doc/cha-auth.texi
+++ b/doc/cha-auth.texi
@@ -342,9 +342,10 @@ the hint, for example in the callback function, using
 @ref{gnutls_psk_client_get_hint}.
 
 There is no standard mechanism to derive a PSK key from a password
-specified by the TLS PSK document.  However, GnuTLS provides
+specified by the TLS PSK document.  GnuTLS provides
 @ref{gnutls_psk_netconf_derive_key} which follows the algorithm
-specified in @file{draft-ietf-netconf-tls-02.txt}.
+specified in @file{draft-ietf-netconf-tls-02.txt}. This method
+is deprecated and might be removed in later versions of GnuTLS.
 
 Some helper functions such as:
 
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index da2bba9d85..81e0b925e6 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -194,4 +194,9 @@ const void *gnutls_session_get_server_random (gnutls_session_t session) _GNUTLS_
 const void *gnutls_session_get_client_random (gnutls_session_t session) _GNUTLS_GCC_ATTR_DEPRECATED;
 const void *gnutls_session_get_master_secret (gnutls_session_t session) _GNUTLS_GCC_ATTR_DEPRECATED;
 
+int gnutls_psk_netconf_derive_key (const char *password,
+				     const char *psk_identity,
+				     const char *psk_identity_hint,
+				     gnutls_datum_t * output_key) _GNUTLS_GCC_ATTR_DEPRECATED;
+
 #endif /* _GNUTLS_COMPAT_H */
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 4efc97a1a8..c038c1a2a4 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -1423,11 +1423,6 @@ extern "C"
 					   res,
 					   gnutls_params_function * func);
 
-  int gnutls_psk_netconf_derive_key (const char *password,
-				     const char *psk_identity,
-				     const char *psk_identity_hint,
-				     gnutls_datum_t * output_key);
-
   /**
    * gnutls_x509_subject_alt_name_t:
    * @GNUTLS_SAN_DNSNAME: DNS-name SAN.