Starting pointer for NETCONF-PSK support.

diff --git a/NEWS b/NEWS
index 59fcaa7e6b51f350c7ce5ba93d94f09651a9423f..e89fba8dba97950d9b76482616ab5326449b077d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,15 @@ Copyright (C) 2004, 2005, 2006, 2007, 2008 Simon Josefsson
 Copyright (C) 2000, 2001, 2002, 2003, 2004 Nikos Mavrogiannopoulos
 See the end for copying conditions.
 
+* Version 2.3.4.netconf.0 (unreleased)
+
+** Support Netconf PSK key derivation.
+The function gnutls_psk_netconf_derive_key supports the PSK key
+derivation as specified in draft-ietf-netconf-tls-01.txt.
+
+** API and ABI modifications:
+gnutls_psk_netconf_derive_key: ADDED
+
 * Version 2.3.4 (released 2008-03-19)
 
 ** Finish renaming of gnutls_certificate_export_x509_cas etc.

diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index 0292ab7cc0f2dea28cb5a9c1e3f1cf85992882c6..07e7d7be2919ae909a81268fb9a38d326f9b295b 100644 (file)
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -998,6 +998,12 @@ 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 *output_key);
+
+
   typedef enum gnutls_x509_subject_alt_name_t
   {
     GNUTLS_SAN_DNSNAME = 1,

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 96691bdbfb09d2357ea1db638953825c2d4149a1..c775d5a035f556b21b2ba55e65435312de73903b 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -66,7 +66,8 @@ lib_LTLIBRARIES = libgnutls.la
 SRP_COBJECTS = ext_srp.c gnutls_srp.c auth_srp.c auth_srp_passwd.c     \
        auth_srp_sb64.c auth_srp_rsa.c
 
-PSK_COBJECTS = auth_psk.c auth_psk_passwd.c gnutls_psk.c auth_dhe_psk.c
+PSK_COBJECTS = auth_psk.c auth_psk_passwd.c gnutls_psk.c       \
+       auth_dhe_psk.c gnutls_psk_netconf.c
 
 OPRFI_COBJECTS = ext_oprfi.c
 

diff --git a/lib/gnutls_psk_netconf.c b/lib/gnutls_psk_netconf.c
new file mode 100644 (file)
index 0000000..853b8a8
--- /dev/null
+++ b/lib/gnutls_psk_netconf.c
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2008 Free Software Foundation
+ *
+ * Author: Simon Josefsson
+ *
+ * This file is part of GNUTLS.
+ *
+ * The GNUTLS library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA
+ *
+ */
+
+/* Functions to support draft-ietf-netconf-tls-01.txt. */
+
+#include <gnutls_int.h>
+
+#ifdef ENABLE_PSK
+
+
+/**
+ * gnutls_psk_netconf_derive_key - derive PSK Netconf key from password
+ * @password: zero terminated string containing password.
+ * @psk_identity: zero terminated string with PSK identity.
+ * @psk_identity_hint: zero terminated string with PSK identity hint.
+ * @output_key: output variable, contains newly allocated *data pointer.
+ *
+ * This function will derive a PSK key from a password, for use with
+ * the Netconf protocol.
+ *
+ * Returns: %GNUTLS_E_SUCCESS on success, or an error code.
+ **/
+int
+gnutls_psk_netconf_derive_key (const char *password,
+                              const char *psk_identity,
+                              const char *psk_identity_hint,
+                              gnutls_datum *output_key)
+{
+  const char netconf_key_pad[] = "Key Pad for Netconf";
+  size_t sha1len = _gnutls_hash_get_algo_len (GNUTLS_DIG_SHA1);
+  size_t hintlen = strlen (psk_identity_hint);
+  digest_hd_st dig;
+  char *inner;
+  size_t innerlen;
+  int rc;
+
+  /*
+   * PSK = SHA-1(SHA-1(password + psk_identity + "Key Pad for Netconf") +
+   *             psk_identity_hint)
+   *
+   */
+
+  innerlen = sha1len + hintlen;
+  inner = gnutls_malloc (len);
+  if (!inner)
+    {
+      gnutls_assert ();
+      return GNUTLS_E_MEMORY_ERROR;
+    }
+
+  rc = _gnutls_hash_init (&dig, GNUTLS_DIG_SHA1);
+  if (!rc)
+    {
+      gnutls_assert ();
+      return rc;
+    }
+
+  rc = _gnutls_hash (&dig, password, strlen (password));
+  if (!rc)
+    {
+      gnutls_assert ();
+      return rc;
+    }
+
+  rc = _gnutls_hash (&dig, psk_identity, strlen (psk_identity));
+  if (!rc)
+    {
+      gnutls_assert ();
+      return rc;
+    }
+
+  rc = _gnutls_hash (&dig, netconf_key_pad, strlen (netconf_key_pad));
+  if (!rc)
+    {
+      gnutls_assert ();
+      return rc;
+    }
+
+  _gnutls_hash_deinit (&dig, inner);
+
+  memcpy (inner + sha1len, psk_identity_hint, hintlen);
+
+  rc = _gnutls_hash_init (&dig, GNUTLS_DIG_SHA1);
+  if (!rc)
+    {
+      gnutls_assert ();
+      return rc;
+    }
+
+  rc = _gnutls_hash (&dig, inner, innerlen);
+  if (!rc)
+    {
+      gnutls_assert ();
+      return rc;
+    }
+
+  output_key->data = gnutls_malloc (sha1len);
+  if (!output_key->data)
+    {
+      gnutls_assert ();
+      return GNUTLS_E_MEMORY_ERROR;
+    }
+  output_key->size = sha1len;
+
+  _gnutls_hash_deinit (&dig, output_key->data);
+
+  return 0
+}
+
+#endif /* ENABLE_PSK */

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7fb1fff02cf9f48e1e1950f7a71340de4da7d8d9..c53bd434a5bdadb2ded61ec23deaeb44b5e43d8a 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -40,7 +40,8 @@ ctests = simple openssl gc set_pkcs12_cred certder    \
        certificate_set_x509_crl dn parse_ca moredn
 openssl_LDADD = $(LDADD) ../libextra/libgnutls-openssl.la
 if HAVE_FORK
-ctests +=  openpgpself x509self x509signself x509dn anonself pskself dhepskself tlsia resume
+ctests += openpgpself x509self x509signself x509dn anonself pskself    \
+       dhepskself tlsia resume netconf-psk
 tlsia_LDADD = ../libextra/libgnutls-extra.la $(LDADD) @LTLIBREADLINE@
 endif
 if ENABLE_OPRFI