[taler-merchant] branch master updated: enforce RFC 8959 prefix for passwords

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new a97ee62d enforce RFC 8959 prefix for passwords
a97ee62d is described below

commit a97ee62dab172a39eab1bebdcd0d8512f5ce4dac
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed May 1 09:42:59 2024 +0200

    enforce RFC 8959 prefix for passwords
---
 contrib/wallet-core                        |  2 +-
 src/merchant-tools/taler-merchant-passwd.c | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/contrib/wallet-core b/contrib/wallet-core
index 240d647d..68b2ef73 160000
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@ -1 +1 @@
-Subproject commit 240d647da85de6b575d15c37efec04757541e3dc
+Subproject commit 68b2ef735377373da29fd20aeb9facaf91c03832
diff --git a/src/merchant-tools/taler-merchant-passwd.c 
b/src/merchant-tools/taler-merchant-passwd.c
index bfd6534d..bcb856e5 100644
--- a/src/merchant-tools/taler-merchant-passwd.c
+++ b/src/merchant-tools/taler-merchant-passwd.c
@@ -54,7 +54,7 @@ run (void *cls,
   const char *pw = args[0];
   struct TALER_MERCHANTDB_InstanceAuthSettings ias;
   enum GNUNET_DB_QueryStatus qs;
-  
+
   if (NULL == pw)
     pw = getenv ("TALER_MERCHANT_PASSWORD");
   if (NULL == pw)
@@ -64,6 +64,16 @@ run (void *cls,
     global_ret = -1;
     return;
   }
+  if (0 != strncmp (pw,
+                    RFC_8959_PREFIX,
+                    strlen (RFC_8959_PREFIX)))
+  {
+    fprintf (stderr,
+             "Invalid password specified, does not begin with `%s'\n",
+             RFC_8959_PREFIX);
+    global_ret = 1;
+    return;
+  }
   if (NULL == instance)
     instance = GNUNET_strdup ("default");
   cfg = GNUNET_CONFIGURATION_dup (config);
@@ -112,7 +122,7 @@ run (void *cls,
         .size = ntohs (sizeof (es)),
         .type = ntohs (TALER_DBEVENT_MERCHANT_INSTANCE_SETTINGS)
       };
-      
+
       plugin->event_notify (plugin->cls,
                             &es,
                             instance,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.