Merge branch 'lmd5' into bcrypt

Conflicts:
	lib/plugins/config/settings/config.metadata.php

1 files changed, 17 insertions, 0 deletions

diff --git a/inc/PassHash.class.php b/inc/PassHash.class.php
index 77f2115bd..2558f37c6 100644
--- a/inc/PassHash.class.php
+++ b/inc/PassHash.class.php
@@ -53,6 +53,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 = 'lsmd5';
+            $salt   = substr(base64_decode(substr($hash, 6)),16);
         }elseif($len == 32){
             $method = 'md5';
         }elseif($len == 40){
@@ -133,6 +136,20 @@ class PassHash {
         }
     }
 
+
+    /**
+     * Password hashing method 'lsmd5'
+     *
+     * Uses salted MD5 hashs. Salt is 8 bytes long.
+     *
+     * This is the format used by LDAP.
+     */
+    public function hash_lsmd5($clear, $salt=null){
+        $this->init_salt($salt,8);
+        return "{SMD5}".base64_encode(md5($clear.$salt, true).$salt);
+    }
+
+
     /**
      * Password hashing method 'apr1'
      *