commit 6f9952abfcebc6a567cddbdb700419837f29f50d
author Gilles Peskine <Gilles.Peskine@arm.com> Fri Sep 06 15:27:57 2024 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Fri Sep 13 09:48:33 2024 +0200
tree 2621db033fbc16f0174df3f921e9e554b29e1452
parent 9404169146964099b7f3b9d40ede0fde982df9f9

ssl-opt: Fix GnuTLS PSK injection

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

framework

diff --git a/framework b/framework
index 7acada6..071831e 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 7acada6a928031340d390b2dce645a3b6129ddad
+Subproject commit 071831e25bd336baa58bbdf65e985283f56e1b86

tests/ssl-opt.sh

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 5829cb7..0ac37f9 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -543,7 +543,8 @@
     case "$2" in
         *openssl*s_server*) s='-psk 73776f726466697368 -nocert';;
         *openssl*) s='-psk 73776f726466697368';;
-        *gnutls-*) s='--pskusername=Client_identity --pskkey=73776f726466697368';;
+        *gnutls-cli*) s='--pskusername=Client_identity --pskkey=73776f726466697368';;
+        *gnutls-serv*) s='--pskpasswd=../framework/data_files/simplepass.psk';;
         *) s='psk=73776f726466697368';;
     esac
     eval $1='"$2 $s"'