From: Simon Josefsson <simon@josefsson.org>
Date: Tue, 6 Feb 2007 15:54:43 +0000 (+0000)
Subject: Don't ask for PSK if we don't have credentials for it.
X-Git-Tag: gnutls_1_7_5~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=32819fd60ae8ee8310dfc3f58bc80d9b2aec439c;p=thirdparty%2Fgnutls.git

Don't ask for PSK if we don't have credentials for it.
---

diff --git a/src/cli.c b/src/cli.c
index ec34f59484..091efdc8c6 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -839,6 +839,23 @@ gaa_parser (int argc, char **argv)
 	    }
 	}
     }
+
+
+  if (!psk_username || !psk_key.data)
+    {
+      size_t i;
+      for (i = 0; kx_priority[i]; i++)
+	{
+	  if (kx_priority[i] == GNUTLS_KX_DHE_PSK ||
+	      kx_priority[i] == GNUTLS_KX_PSK)
+	    {
+	      memmove (&kx_priority[i],
+		       &kx_priority[i+1],
+		       sizeof (*kx_priority) * (PRI_MAX - i - 1));
+	      i--;
+	    }
+	}
+    }
 }
 
 void