PHP5 changes
This commit is contained in:
Roland Gruber
parent
fbfe265310
commit
a48f7cf933
|
|
@ -42,7 +42,7 @@ class smbHash {
|
|||
|
||||
# Contants used in lanlam hash calculations
|
||||
# Ported from SAMBA/source/libsmb/smbdes.c:perm1[56]
|
||||
var $perm1 = array(57, 49, 41, 33, 25, 17, 9,
|
||||
private $perm1 = array(57, 49, 41, 33, 25, 17, 9,
|
||||
1, 58, 50, 42, 34, 26, 18,
|
||||
10, 2, 59, 51, 43, 35, 27,
|
||||
19, 11, 3, 60, 52, 44, 36,
|
||||
|
|
@ -51,7 +51,7 @@ var $perm1 = array(57, 49, 41, 33, 25, 17, 9,
|
|||
14, 6, 61, 53, 45, 37, 29,
|
||||
21, 13, 5, 28, 20, 12, 4);
|
||||
# Ported from SAMBA/source/libsmb/smbdes.c:perm2[48]
|
||||
var $perm2 = array(14, 17, 11, 24, 1, 5,
|
||||
private $perm2 = array(14, 17, 11, 24, 1, 5,
|
||||
3, 28, 15, 6, 21, 10,
|
||||
23, 19, 12, 4, 26, 8,
|
||||
16, 7, 27, 20, 13, 2,
|
||||
|
|
@ -60,7 +60,7 @@ var $perm2 = array(14, 17, 11, 24, 1, 5,
|
|||
44, 49, 39, 56, 34, 53,
|
||||
46, 42, 50, 36, 29, 32);
|
||||
# Ported from SAMBA/source/libsmb/smbdes.c:perm3[64]
|
||||
var $perm3 = array(58, 50, 42, 34, 26, 18, 10, 2,
|
||||
private $perm3 = array(58, 50, 42, 34, 26, 18, 10, 2,
|
||||
60, 52, 44, 36, 28, 20, 12, 4,
|
||||
62, 54, 46, 38, 30, 22, 14, 6,
|
||||
64, 56, 48, 40, 32, 24, 16, 8,
|
||||
|
|
@ -69,7 +69,7 @@ var $perm3 = array(58, 50, 42, 34, 26, 18, 10, 2,
|
|||
61, 53, 45, 37, 29, 21, 13, 5,
|
||||
63, 55, 47, 39, 31, 23, 15, 7);
|
||||
# Ported from SAMBA/source/libsmb/smbdes.c:perm4[48]
|
||||
var $perm4 = array(32, 1, 2, 3, 4, 5,
|
||||
private $perm4 = array(32, 1, 2, 3, 4, 5,
|
||||
4, 5, 6, 7, 8, 9,
|
||||
8, 9, 10, 11, 12, 13,
|
||||
12, 13, 14, 15, 16, 17,
|
||||
|
|
@ -78,7 +78,7 @@ var $perm4 = array(32, 1, 2, 3, 4, 5,
|
|||
24, 25, 26, 27, 28, 29,
|
||||
28, 29, 30, 31, 32, 1);
|
||||
# Ported from SAMBA/source/libsmb/smbdes.c:perm5[32]
|
||||
var $perm5 = array(16, 7, 20, 21,
|
||||
private $perm5 = array(16, 7, 20, 21,
|
||||
29, 12, 28, 17,
|
||||
1, 15, 23, 26,
|
||||
5, 18, 31, 10,
|
||||
|
|
@ -87,7 +87,7 @@ var $perm5 = array(16, 7, 20, 21,
|
|||
19, 13, 30, 6,
|
||||
22, 11, 4, 25);
|
||||
# Ported from SAMBA/source/libsmb/smbdes.c:perm6[64]
|
||||
var $perm6 = array(40, 8, 48, 16, 56, 24, 64, 32,
|
||||
private $perm6 = array(40, 8, 48, 16, 56, 24, 64, 32,
|
||||
39, 7, 47, 15, 55, 23, 63, 31,
|
||||
38, 6, 46, 14, 54, 22, 62, 30,
|
||||
37, 5, 45, 13, 53, 21, 61, 29,
|
||||
|
|
@ -96,11 +96,11 @@ var $perm6 = array(40, 8, 48, 16, 56, 24, 64, 32,
|
|||
34, 2, 42, 10, 50, 18, 58, 26,
|
||||
33, 1, 41, 9, 49, 17, 57, 25);
|
||||
# Ported from SAMBA/source/libsmb/smbdes.c:sc[16]
|
||||
var $sc = array(1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1);
|
||||
private $sc = array(1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1);
|
||||
# Ported from SAMBA/source/libsmb/smbdes.c:sbox[8][4][16]
|
||||
# Side note, I used cut and paste for all these numbers, I did NOT
|
||||
# type them all in =)
|
||||
var $sbox = array(array(array(14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7),
|
||||
private $sbox = array(array(array(14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7),
|
||||
array( 0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8),
|
||||
array( 4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0),
|
||||
array(15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13)),
|
||||
|
|
@ -136,7 +136,7 @@ var $sbox = array(array(array(14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5
|
|||
/**
|
||||
* Fixes too large numbers
|
||||
*/
|
||||
function x($i) {
|
||||
private function x($i) {
|
||||
if ($i < 0) return 4294967296 - $i;
|
||||
else return $i;
|
||||
}
|
||||
|
|
@ -146,7 +146,7 @@ var $sbox = array(array(array(14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5
|
|||
* @param array $data
|
||||
* @return array
|
||||
*/
|
||||
function lshift($count, $data) {
|
||||
private function lshift($count, $data) {
|
||||
$ret = array();
|
||||
for ($i = 0; $i < sizeof($data); $i++) {
|
||||
$ret[$i] = $data[($i + $count)%sizeof($data)];
|
||||
|
|
@ -159,7 +159,7 @@ var $sbox = array(array(array(14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5
|
|||
* @param array p permutation
|
||||
* @return array
|
||||
*/
|
||||
function permute($in, $p, $n) {
|
||||
private function permute($in, $p, $n) {
|
||||
$ret = array();
|
||||
for ($i = 0; $i < $n; $i++) {
|
||||
$ret[$i] = $in[$p[$i] - 1]?1:0;
|
||||
|
|
@ -172,7 +172,7 @@ var $sbox = array(array(array(14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5
|
|||
* @param array $in2
|
||||
* @return array
|
||||
*/
|
||||
function mxor($in1, $in2) {
|
||||
private function mxor($in1, $in2) {
|
||||
$ret = array();
|
||||
for ($i = 0; $i < sizeof($in1); $i++) {
|
||||
$ret[$i] = $in1[$i] ^ $in2[$i];
|
||||
|
|
@ -258,7 +258,7 @@ var $sbox = array(array(array(14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5
|
|||
* @param string $str
|
||||
* @return string key
|
||||
*/
|
||||
function str_to_key($str) {
|
||||
private function str_to_key($str) {
|
||||
$key[0] = $this->unsigned_shift_r($str[0], 1);
|
||||
$key[1] = (($str[0]&0x01)<<6) | $this->unsigned_shift_r($str[1], 2);
|
||||
$key[2] = (($str[1]&0x03)<<5) | $this->unsigned_shift_r($str[2], 3);
|
||||
|
|
@ -281,7 +281,7 @@ var $sbox = array(array(array(14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5
|
|||
* @param unknown_type $forw
|
||||
* @return unknown
|
||||
*/
|
||||
function smb_hash($in, $key, $forw){
|
||||
private function smb_hash($in, $key, $forw){
|
||||
$key2 = $this->str_to_key($key);
|
||||
|
||||
for ($i = 0; $i < 64; $i++) {
|
||||
|
|
@ -307,7 +307,7 @@ var $sbox = array(array(array(14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5
|
|||
* @param unknown_type $in
|
||||
* @return unknown
|
||||
*/
|
||||
function E_P16($in) {
|
||||
private function E_P16($in) {
|
||||
$p14 = array_values(unpack("C*",$in));
|
||||
$sp8 = array(0x4b, 0x47, 0x53, 0x21, 0x40, 0x23, 0x24, 0x25);
|
||||
$p14_1 = array();
|
||||
|
|
@ -331,7 +331,7 @@ var $sbox = array(array(array(14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5
|
|||
* @param string $password password
|
||||
* @return string hash value
|
||||
*/
|
||||
function lmhash($password = "") {
|
||||
public function lmhash($password = "") {
|
||||
$password = strtoupper($password);
|
||||
$password = substr($password,0,14);
|
||||
$password = str_pad($password, 14, chr(0));
|
||||
|
|
@ -348,7 +348,7 @@ var $sbox = array(array(array(14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5
|
|||
* @param string $password password
|
||||
* @return string hash value
|
||||
*/
|
||||
function nthash($password = "") {
|
||||
public function nthash($password = "") {
|
||||
return strtoupper(bin2hex(mhash(MHASH_MD4, iconv("UTF-8","UTF-16LE",$password))));
|
||||
}
|
||||
|
||||
|
|
@ -357,7 +357,7 @@ var $sbox = array(array(array(14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5
|
|||
*
|
||||
* PHP 4 only supports signed shifts by default.
|
||||
*/
|
||||
function unsigned_shift_r($a, $b) {
|
||||
private function unsigned_shift_r($a, $b) {
|
||||
$z = 0x80000000;
|
||||
if ($z & $a) {
|
||||
$a = ($a >> 1);
|
||||
|
|
|
|||
Loading…
Reference in New Issue