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.34 -r1.150.2.35 --- openacs-4/packages/acs-kernel/acs-kernel.info 28 Sep 2021 12:46:48 -0000 1.150.2.34 +++ openacs-4/packages/acs-kernel/acs-kernel.info 29 Sep 2021 12:09:58 -0000 1.150.2.35 @@ -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 - + @@ -85,7 +85,7 @@ - + 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.2 -r1.19.10.3 --- openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql 23 Feb 2019 13:03:40 -0000 1.19.10.2 +++ openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql 29 Sep 2021 12:09:59 -0000 1.19.10.3 @@ -577,7 +577,9 @@ second_to_last_visit date, n_sessions integer default 1 not null, -- local authentication information - password char(40), + password varchar2(128), + password_hash_algorithm varchar2(100) + 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.1d1-5.10.1d2.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.3 -r1.29.6.4 --- openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql 4 Apr 2019 11:01:53 -0000 1.29.6.3 +++ openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql 29 Sep 2021 12:09:59 -0000 1.29.6.4 @@ -643,7 +643,9 @@ second_to_last_visit timestamptz, n_sessions integer default 1 not null, -- local authentication information - password char(40), + password character varying(128), + password_hash_algorithm character varying(100) + 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.1d1-5.10.1d2.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.31 -r1.95.2.32 --- openacs-4/packages/acs-tcl/acs-tcl.info 28 Sep 2021 12:46:47 -0000 1.95.2.31 +++ openacs-4/packages/acs-tcl/acs-tcl.info 29 Sep 2021 12:09:59 -0000 1.95.2.32 @@ -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.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 } {