From 502a92e072be7b42750b4c9032e7269d1fd7c7b4 Mon Sep 17 00:00:00 2001
From: Patrick Michel <public@pbmichel.de>
Date: Sun, 27 Nov 2011 10:55:27 +0100
Subject: MD5 password hash format of the LDAP RFC FS#2378

This implements the salted MD5 password hash format of the LDAP RFC.
The format is quite simple the password, followed by the 8 byte hash in
base64 encoding, which results in 32 characters, prepended with the
string "{smd5}".
---
 inc/PassHash.class.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'inc/PassHash.class.php')

diff --git a/inc/PassHash.class.php b/inc/PassHash.class.php
index 31493c022..c13cf4a54 100644
--- a/inc/PassHash.class.php
+++ b/inc/PassHash.class.php
@@ -50,6 +50,9 @@ class PassHash {
         }elseif(substr($hash,0,6) == '{SSHA}'){
             $method = 'ssha';
             $salt   = substr(base64_decode(substr($hash, 6)),20);
+        }elseif(substr($hash,0,6) == '{SMD5}'){
+            $method = 'smd6';
+            $salt   = substr(base64_decode(substr($hash, 6)),16);
         }elseif($len == 32){
             $method = 'md5';
         }elseif($len == 40){
@@ -130,6 +133,18 @@ class PassHash {
         }
     }
 
+
+    /**
+     * Password hashing method 'smd6'
+     *
+     * Uses salted MD5 hashs. Salt is 8 bytes long. Yes, really 8 bytes...
+     */
+    public function hash_smd6($clear, $salt=null){
+      $this->init_salt($salt,8);
+      return "{SMD5}".base64_encode(md5($clear.$salt, true).$salt);
+    }
+
+
     /**
      * Password hashing method 'apr1'
      *
-- 
cgit v1.2.3


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: renamed passhash method smd6 to lsmd5

---
 inc/PassHash.class.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'inc/PassHash.class.php')

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);
     }
 
 
-- 
cgit v1.2.3