Change PSK key derivation algorithm.

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/gnutls_psk_netconf.c b/lib/gnutls_psk_netconf.c
index eeb6f5880d..37c39a6926 100644
--- a/lib/gnutls_psk_netconf.c
+++ b/lib/gnutls_psk_netconf.c
@@ -58,7 +58,7 @@ gnutls_psk_netconf_derive_key (const char *password,
   int rc;
 
   /*
-   * PSK = SHA-1(SHA-1(password + psk_identity + "Key Pad for Netconf") +
+   * PSK = SHA-1(SHA-1(psk_identity + "Key Pad for Netconf" + password) +
    *             psk_identity_hint)
    *
    */
@@ -70,7 +70,7 @@ gnutls_psk_netconf_derive_key (const char *password,
       return rc;
     }
 
-  rc = _gnutls_hash (&dig, password, strlen (password));
+  rc = _gnutls_hash (&dig, psk_identity, strlen (psk_identity));
   if (rc)
     {
       gnutls_assert ();
@@ -78,7 +78,7 @@ gnutls_psk_netconf_derive_key (const char *password,
       return rc;
     }
 
-  rc = _gnutls_hash (&dig, psk_identity, strlen (psk_identity));
+  rc = _gnutls_hash (&dig, netconf_key_pad, strlen (netconf_key_pad));
   if (rc)
     {
       gnutls_assert ();
@@ -86,7 +86,7 @@ gnutls_psk_netconf_derive_key (const char *password,
       return rc;
     }
 
-  rc = _gnutls_hash (&dig, netconf_key_pad, strlen (netconf_key_pad));
+  rc = _gnutls_hash (&dig, password, strlen (password));
   if (rc)
     {
       gnutls_assert ();