From 491a2c68bc685e7e0cd4f9622ef4051e4a580d62 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 27 Nov 2011 11:08:07 +0100
Subject: [PATCH] renamed passhash method smd6 to lsmd5
---
inc/PassHash.class.php | 14 ++++++++------
lib/plugins/config/settings/config.metadata.php | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/inc/PassHash.class.php b/inc/PassHash.class.php
index c13cf4a54..8f62425aa 100644
--- a/inc/PassHash.class.php
+++ b/inc/PassHash.class.php
@@ -51,7 +51,7 @@ class PassHash {
$method = 'ssha';
$salt = substr(base64_decode(substr($hash, 6)),20);
}elseif(substr($hash,0,6) == '{SMD5}'){
- $method = 'smd6';
+ $method = 'lsmd5';
$salt = substr(base64_decode(substr($hash, 6)),16);
}elseif($len == 32){
$method = 'md5';
@@ -135,13 +135,15 @@ class PassHash {
/**
- * Password hashing method 'smd6'
+ * Password hashing method 'lsmd5'
*
- * Uses salted MD5 hashs. Salt is 8 bytes long. Yes, really 8 bytes...
+ * Uses salted MD5 hashs. Salt is 8 bytes long.
+ *
+ * This is the format used by LDAP.
*/
- public function hash_smd6($clear, $salt=null){
- $this->init_salt($salt,8);
- return "{SMD5}".base64_encode(md5($clear.$salt, true).$salt);
+ public function hash_lsmd5($clear, $salt=null){
+ $this->init_salt($salt,8);
+ return "{SMD5}".base64_encode(md5($clear.$salt, true).$salt);
}
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index c943a2fad..0315ecae6 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -123,7 +123,7 @@ $meta['_authentication'] = array('fieldset');
$meta['useacl'] = array('onoff');
$meta['autopasswd'] = array('onoff');
$meta['authtype'] = array('authtype');
-$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','smd6','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5'));
+$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5'));
$meta['defaultgroup']= array('string');
$meta['superuser'] = array('string');
$meta['manager'] = array('string');
--
GitLab