[Fusionforge-commits] FusionForge branch master updated. v6.0.3-231-g34b77b8

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Wed Nov 18 10:51:02 CET 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  34b77b814323ca0cd19e777385c51a029749fa5c (commit)
       via  559369d03160f7a3a921df4753cd2a48678317a5 (commit)
       via  b8f6d1d35fad18b5f3f6aafb39801b1eb420c0bf (commit)
       via  62da2379df0bf38de2f3946e0e2e09e2e4979e6a (commit)
       via  b21fb65ab443f8847d033542af7d3ea7074fa0d5 (commit)
      from  52e92f4c6b487307f6dffcc4bd25882f5f55ce58 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=34b77b814323ca0cd19e777385c51a029749fa5c

commit 34b77b814323ca0cd19e777385c51a029749fa5c
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Nov 18 10:50:50 2015 +0100

    account: upgrade default hash to CRYPT-SHA512

diff --git a/src/common/include/account.php b/src/common/include/account.php
index 40ba613..1d5d3db 100644
--- a/src/common/include/account.php
+++ b/src/common/include/account.php
@@ -173,7 +173,6 @@ function account_gensalt(){
 		case 'DES':
 			$salt_size = 2;
 			break;
-		default:
 		case 'MD5':
 			$salt_prefix = '$1$';
 			$salt_size = 8;
@@ -182,6 +181,7 @@ function account_gensalt(){
 			$salt_prefix = '$5$rounds=5000$';
 			$salt_size = 16;
 			break;
+		default:
 		case 'SHA512':
 			$salt_prefix = '$6$rounds=5000$';
 			$salt_size = 16;
diff --git a/src/etc/config.ini.d/defaults.ini b/src/etc/config.ini.d/defaults.ini
index 597977d..3975306 100644
--- a/src/etc/config.ini.d/defaults.ini
+++ b/src/etc/config.ini.d/defaults.ini
@@ -51,7 +51,7 @@ sendmail_path = "/usr/sbin/sendmail"
 show_source = no
 stats_group = 3
 template_group = 5
-unix_cipher = MD5
+unix_cipher = SHA512
 url_prefix = "/"
 use_activity = yes
 use_docman = yes

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=559369d03160f7a3a921df4753cd2a48678317a5

commit 559369d03160f7a3a921df4753cd2a48678317a5
Merge: 52e92f4 b8f6d1d
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Nov 18 10:49:08 2015 +0100

    Merge branch '6.0'


-----------------------------------------------------------------------

Summary of changes:
 src/CHANGES                               |  3 ++
 src/common/include/account.php            | 35 +++++++++-----
 src/common/include/system/pgsql.class.php |  9 ++++
 src/etc/config.ini.d/defaults.ini         |  2 +-
 tests/unit/common/account.php             | 80 +++++++++++++++++++++++++++++++
 5 files changed, 117 insertions(+), 12 deletions(-)
 create mode 100644 tests/unit/common/account.php


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list