Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -N -r1.126.2.53 -r1.126.2.54
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	28 Sep 2021 12:46:48 -0000	1.126.2.53
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	29 Sep 2021 12:10:00 -0000	1.126.2.54
@@ -627,7 +627,7 @@
     ad_proc -private preferred_password_hash_algorithm {} {
 
         Check the list of preferred password hash algorithms and the
-        return the best which is available (or "salted-sha1" if
+        return the best which is available (or "salted_sha1" if
         nothing applies).
 
         @return password preferred hash algorithm
@@ -636,7 +636,7 @@
         set preferences [parameter::get \
                              -parameter PasswordHashAlgorithm \
                              -package_id $::acs::kernel_id \
-                             -default "salted-sha1"]
+                             -default "salted_sha1"]
         foreach algo $preferences {
             if {[info commands ::security::hash::$algo] ne ""} {
                 #
@@ -654,12 +654,12 @@
         ns_log warning "No valid PasswordHashAlgorithm was specified: '$preferences'." \
             "Fall back to default."
 
-        return "salted-sha1"
+        return "salted_sha1"
     }
 }
 
 namespace eval ::security::hash {
-    ad_proc -private salted-sha1 {password salt} {
+    ad_proc -private salted_sha1 {password salt} {
 
         Classical OpenACS password hash algorithm. This algorithm must
         be always available and is independent of the
@@ -673,7 +673,7 @@
     }
 
     if {[::acs::icanuse "ns_crypto::pbkdf2_hmac"]} {
-        ad_proc -private scram-sha-256 {password salt} {
+        ad_proc -private scram_sha_256 {password salt} {
 
             SCRAM hash function using sha256 as digest function. The
             SCRAM hash function is PBKDF2 [RFC2898] with HMAC as the
@@ -730,7 +730,7 @@
 }
 
 ad_proc -public ad_change_password {
-    {-password_hash_algorithm "salted-sha1"}
+    {-password_hash_algorithm "salted_sha1"}
     user_id
     new_password
 } {