Index: openacs-4/packages/acs-kernel/acs-kernel.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/acs-kernel.info,v diff -u -r1.150.2.35 -r1.150.2.36 --- openacs-4/packages/acs-kernel/acs-kernel.info 29 Sep 2021 12:09:58 -0000 1.150.2.35 +++ openacs-4/packages/acs-kernel/acs-kernel.info 1 Oct 2021 07:30:10 -0000 1.150.2.36 @@ -9,15 +9,15 @@ f t - + OpenACS Core Team Routines and data models providing the foundation for OpenACS-based Web services. 2021-09-15 OpenACS The OpenACS kernel contains the core datamodel create and drop scripts for such things as objects, groups, parties and the supporting PL/SQL and PL/pgSQL procedures. 3 - + Index: openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql,v diff -u -r1.19.10.3 -r1.19.10.4 --- openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql 29 Sep 2021 12:09:59 -0000 1.19.10.3 +++ openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql 1 Oct 2021 07:30:11 -0000 1.19.10.4 @@ -579,7 +579,7 @@ -- local authentication information password varchar2(128), password_hash_algorithm varchar2(100) - DEFAULT 'salted_sha1' NOT NULL, + DEFAULT 'salted-sha1' NOT NULL, salt char(40), password_question varchar2(1000), password_answer varchar2(1000), Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.10.1d2-5.10.1d3.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql,v diff -u -r1.29.6.4 -r1.29.6.5 --- openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql 29 Sep 2021 12:09:59 -0000 1.29.6.4 +++ openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql 1 Oct 2021 07:30:12 -0000 1.29.6.5 @@ -645,7 +645,7 @@ -- local authentication information password character varying(128), password_hash_algorithm character varying(100) - DEFAULT 'salted_sha1' NOT NULL, + DEFAULT 'salted-sha1' NOT NULL, salt char(40), password_question varchar(1000), password_answer varchar(1000), Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.10.1d2-5.10.1d3.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-tcl/acs-tcl.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v diff -u -r1.95.2.32 -r1.95.2.33 --- openacs-4/packages/acs-tcl/acs-tcl.info 29 Sep 2021 12:09:59 -0000 1.95.2.32 +++ openacs-4/packages/acs-tcl/acs-tcl.info 1 Oct 2021 07:30:07 -0000 1.95.2.33 @@ -9,7 +9,7 @@ f t - + OpenACS The Kernel Tcl API library. 2021-09-15 @@ -18,9 +18,9 @@ GPL version 2 3 - + - + 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 -r1.126.2.54 -r1.126.2.55 --- openacs-4/packages/acs-tcl/tcl/security-procs.tcl 29 Sep 2021 12:10:00 -0000 1.126.2.54 +++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl 1 Oct 2021 07:30:07 -0000 1.126.2.55 @@ -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 } { Index: openacs-4/packages/acs-tcl/tcl/test/doc-check-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/doc-check-procs.tcl,v diff -u -r1.20.2.18 -r1.20.2.19 --- openacs-4/packages/acs-tcl/tcl/test/doc-check-procs.tcl 5 May 2021 15:28:28 -0000 1.20.2.18 +++ openacs-4/packages/acs-tcl/tcl/test/doc-check-procs.tcl 1 Oct 2021 07:30:07 -0000 1.20.2.19 @@ -65,6 +65,7 @@ set functionalOps {^f::(-|/)$} set internalUse {^(_.+|AcsSc[.].+|callback::.+|install::.+|.*[-](lob|text|gridfs|file))$} set prescribed {^((after|before|notifications)-([a-zA-Z0-9_]+))$} + set nameWarning {public error private warning} foreach p [lsort -dictionary [nsv_array names api_proc_doc]] { if {[string match "* *" $p]} continue @@ -99,7 +100,8 @@ ) && ![regexp $prescribed $tail] } { - aa_log_result fail "proc '$p' ($protection): name/namespace contains invalid characters" + aa_log_result [dict get $nameWarning $protection] \ + "proc '$p' ($protection): name/namespace contains invalid characters" } else { incr good }