nuxsmin /
sysPass
@@ -734,15 +734,15 @@ discard block |
||
| 734 | 734 | return false; |
| 735 | 735 | } |
| 736 | 736 | return "<RSAKeyValue>\r\n" . |
| 737 | - ' <Modulus>' . base64_encode($raw['modulus']) . "</Modulus>\r\n" . |
|
| 738 | - ' <Exponent>' . base64_encode($raw['publicExponent']) . "</Exponent>\r\n" . |
|
| 739 | - ' <P>' . base64_encode($raw['prime1']) . "</P>\r\n" . |
|
| 740 | - ' <Q>' . base64_encode($raw['prime2']) . "</Q>\r\n" . |
|
| 741 | - ' <DP>' . base64_encode($raw['exponent1']) . "</DP>\r\n" . |
|
| 742 | - ' <DQ>' . base64_encode($raw['exponent2']) . "</DQ>\r\n" . |
|
| 743 | - ' <InverseQ>' . base64_encode($raw['coefficient']) . "</InverseQ>\r\n" . |
|
| 744 | - ' <D>' . base64_encode($raw['privateExponent']) . "</D>\r\n" . |
|
| 745 | - '</RSAKeyValue>'; |
|
| 737 | + ' <Modulus>' . base64_encode($raw['modulus']) . "</Modulus>\r\n" . |
|
| 738 | + ' <Exponent>' . base64_encode($raw['publicExponent']) . "</Exponent>\r\n" . |
|
| 739 | + ' <P>' . base64_encode($raw['prime1']) . "</P>\r\n" . |
|
| 740 | + ' <Q>' . base64_encode($raw['prime2']) . "</Q>\r\n" . |
|
| 741 | + ' <DP>' . base64_encode($raw['exponent1']) . "</DP>\r\n" . |
|
| 742 | + ' <DQ>' . base64_encode($raw['exponent2']) . "</DQ>\r\n" . |
|
| 743 | + ' <InverseQ>' . base64_encode($raw['coefficient']) . "</InverseQ>\r\n" . |
|
| 744 | + ' <D>' . base64_encode($raw['privateExponent']) . "</D>\r\n" . |
|
| 745 | + '</RSAKeyValue>'; |
|
| 746 | 746 | break; |
| 747 | 747 | case self::PRIVATE_FORMAT_PUTTY: |
| 748 | 748 | if ($num_primes != 2) { |
@@ -897,12 +897,12 @@ discard block |
||
| 897 | 897 | $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey); |
| 898 | 898 | |
| 899 | 899 | $RSAPrivateKey = "-----BEGIN ENCRYPTED PRIVATE KEY-----\r\n" . |
| 900 | - chunk_split(base64_encode($RSAPrivateKey), 64) . |
|
| 901 | - '-----END ENCRYPTED PRIVATE KEY-----'; |
|
| 900 | + chunk_split(base64_encode($RSAPrivateKey), 64) . |
|
| 901 | + '-----END ENCRYPTED PRIVATE KEY-----'; |
|
| 902 | 902 | } else { |
| 903 | 903 | $RSAPrivateKey = "-----BEGIN PRIVATE KEY-----\r\n" . |
| 904 | - chunk_split(base64_encode($RSAPrivateKey), 64) . |
|
| 905 | - '-----END PRIVATE KEY-----'; |
|
| 904 | + chunk_split(base64_encode($RSAPrivateKey), 64) . |
|
| 905 | + '-----END PRIVATE KEY-----'; |
|
| 906 | 906 | } |
| 907 | 907 | return $RSAPrivateKey; |
| 908 | 908 | } |
@@ -916,15 +916,15 @@ discard block |
||
| 916 | 916 | $des->setIV($iv); |
| 917 | 917 | $iv = strtoupper(bin2hex($iv)); |
| 918 | 918 | $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" . |
| 919 | - "Proc-Type: 4,ENCRYPTED\r\n" . |
|
| 920 | - "DEK-Info: DES-EDE3-CBC,$iv\r\n" . |
|
| 921 | - "\r\n" . |
|
| 922 | - chunk_split(base64_encode($des->encrypt($RSAPrivateKey)), 64) . |
|
| 923 | - '-----END RSA PRIVATE KEY-----'; |
|
| 919 | + "Proc-Type: 4,ENCRYPTED\r\n" . |
|
| 920 | + "DEK-Info: DES-EDE3-CBC,$iv\r\n" . |
|
| 921 | + "\r\n" . |
|
| 922 | + chunk_split(base64_encode($des->encrypt($RSAPrivateKey)), 64) . |
|
| 923 | + '-----END RSA PRIVATE KEY-----'; |
|
| 924 | 924 | } else { |
| 925 | 925 | $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" . |
| 926 | - chunk_split(base64_encode($RSAPrivateKey), 64) . |
|
| 927 | - '-----END RSA PRIVATE KEY-----'; |
|
| 926 | + chunk_split(base64_encode($RSAPrivateKey), 64) . |
|
| 927 | + '-----END RSA PRIVATE KEY-----'; |
|
| 928 | 928 | } |
| 929 | 929 | |
| 930 | 930 | return $RSAPrivateKey; |
@@ -951,9 +951,9 @@ discard block |
||
| 951 | 951 | return array('e' => $e->copy(), 'n' => $n->copy()); |
| 952 | 952 | case self::PUBLIC_FORMAT_XML: |
| 953 | 953 | return "<RSAKeyValue>\r\n" . |
| 954 | - ' <Modulus>' . base64_encode($modulus) . "</Modulus>\r\n" . |
|
| 955 | - ' <Exponent>' . base64_encode($publicExponent) . "</Exponent>\r\n" . |
|
| 956 | - '</RSAKeyValue>'; |
|
| 954 | + ' <Modulus>' . base64_encode($modulus) . "</Modulus>\r\n" . |
|
| 955 | + ' <Exponent>' . base64_encode($publicExponent) . "</Exponent>\r\n" . |
|
| 956 | + '</RSAKeyValue>'; |
|
| 957 | 957 | break; |
| 958 | 958 | case self::PUBLIC_FORMAT_OPENSSH: |
| 959 | 959 | // from <http://tools.ietf.org/html/rfc4253#page-15>: |
@@ -1001,8 +1001,8 @@ discard block |
||
| 1001 | 1001 | ); |
| 1002 | 1002 | |
| 1003 | 1003 | $RSAPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" . |
| 1004 | - chunk_split(base64_encode($RSAPublicKey), 64) . |
|
| 1005 | - '-----END PUBLIC KEY-----'; |
|
| 1004 | + chunk_split(base64_encode($RSAPublicKey), 64) . |
|
| 1005 | + '-----END PUBLIC KEY-----'; |
|
| 1006 | 1006 | } |
| 1007 | 1007 | |
| 1008 | 1008 | return $RSAPublicKey; |
@@ -423,13 +423,13 @@ discard block |
||
| 423 | 423 | list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[3], $le_longs[4]); |
| 424 | 424 | for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) { |
| 425 | 425 | $A = $m0[$q0[$q0[$i] ^ $key[ 9]] ^ $key[1]] ^ |
| 426 | - $m1[$q0[$q1[$i] ^ $key[10]] ^ $key[2]] ^ |
|
| 427 | - $m2[$q1[$q0[$i] ^ $key[11]] ^ $key[3]] ^ |
|
| 428 | - $m3[$q1[$q1[$i] ^ $key[12]] ^ $key[4]]; |
|
| 426 | + $m1[$q0[$q1[$i] ^ $key[10]] ^ $key[2]] ^ |
|
| 427 | + $m2[$q1[$q0[$i] ^ $key[11]] ^ $key[3]] ^ |
|
| 428 | + $m3[$q1[$q1[$i] ^ $key[12]] ^ $key[4]]; |
|
| 429 | 429 | $B = $m0[$q0[$q0[$j] ^ $key[13]] ^ $key[5]] ^ |
| 430 | - $m1[$q0[$q1[$j] ^ $key[14]] ^ $key[6]] ^ |
|
| 431 | - $m2[$q1[$q0[$j] ^ $key[15]] ^ $key[7]] ^ |
|
| 432 | - $m3[$q1[$q1[$j] ^ $key[16]] ^ $key[8]]; |
|
| 430 | + $m1[$q0[$q1[$j] ^ $key[14]] ^ $key[6]] ^ |
|
| 431 | + $m2[$q1[$q0[$j] ^ $key[15]] ^ $key[7]] ^ |
|
| 432 | + $m3[$q1[$q1[$j] ^ $key[16]] ^ $key[8]]; |
|
| 433 | 433 | $B = ($B << 8) | ($B >> 24 & 0xff); |
| 434 | 434 | $K[] = $A+= $B; |
| 435 | 435 | $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff); |
@@ -447,13 +447,13 @@ discard block |
||
| 447 | 447 | list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[5], $le_longs[6]); |
| 448 | 448 | for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) { |
| 449 | 449 | $A = $m0[$q0[$q0[$q1[$i] ^ $key[17]] ^ $key[ 9]] ^ $key[1]] ^ |
| 450 | - $m1[$q0[$q1[$q1[$i] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^ |
|
| 451 | - $m2[$q1[$q0[$q0[$i] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^ |
|
| 452 | - $m3[$q1[$q1[$q0[$i] ^ $key[20]] ^ $key[12]] ^ $key[4]]; |
|
| 450 | + $m1[$q0[$q1[$q1[$i] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^ |
|
| 451 | + $m2[$q1[$q0[$q0[$i] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^ |
|
| 452 | + $m3[$q1[$q1[$q0[$i] ^ $key[20]] ^ $key[12]] ^ $key[4]]; |
|
| 453 | 453 | $B = $m0[$q0[$q0[$q1[$j] ^ $key[21]] ^ $key[13]] ^ $key[5]] ^ |
| 454 | - $m1[$q0[$q1[$q1[$j] ^ $key[22]] ^ $key[14]] ^ $key[6]] ^ |
|
| 455 | - $m2[$q1[$q0[$q0[$j] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^ |
|
| 456 | - $m3[$q1[$q1[$q0[$j] ^ $key[24]] ^ $key[16]] ^ $key[8]]; |
|
| 454 | + $m1[$q0[$q1[$q1[$j] ^ $key[22]] ^ $key[14]] ^ $key[6]] ^ |
|
| 455 | + $m2[$q1[$q0[$q0[$j] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^ |
|
| 456 | + $m3[$q1[$q1[$q0[$j] ^ $key[24]] ^ $key[16]] ^ $key[8]]; |
|
| 457 | 457 | $B = ($B << 8) | ($B >> 24 & 0xff); |
| 458 | 458 | $K[] = $A+= $B; |
| 459 | 459 | $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff); |
@@ -472,13 +472,13 @@ discard block |
||
| 472 | 472 | list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[7], $le_longs[8]); |
| 473 | 473 | for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) { |
| 474 | 474 | $A = $m0[$q0[$q0[$q1[$q1[$i] ^ $key[25]] ^ $key[17]] ^ $key[ 9]] ^ $key[1]] ^ |
| 475 | - $m1[$q0[$q1[$q1[$q0[$i] ^ $key[26]] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^ |
|
| 476 | - $m2[$q1[$q0[$q0[$q0[$i] ^ $key[27]] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^ |
|
| 477 | - $m3[$q1[$q1[$q0[$q1[$i] ^ $key[28]] ^ $key[20]] ^ $key[12]] ^ $key[4]]; |
|
| 475 | + $m1[$q0[$q1[$q1[$q0[$i] ^ $key[26]] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^ |
|
| 476 | + $m2[$q1[$q0[$q0[$q0[$i] ^ $key[27]] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^ |
|
| 477 | + $m3[$q1[$q1[$q0[$q1[$i] ^ $key[28]] ^ $key[20]] ^ $key[12]] ^ $key[4]]; |
|
| 478 | 478 | $B = $m0[$q0[$q0[$q1[$q1[$j] ^ $key[29]] ^ $key[21]] ^ $key[13]] ^ $key[5]] ^ |
| 479 | - $m1[$q0[$q1[$q1[$q0[$j] ^ $key[30]] ^ $key[22]] ^ $key[14]] ^ $key[6]] ^ |
|
| 480 | - $m2[$q1[$q0[$q0[$q0[$j] ^ $key[31]] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^ |
|
| 481 | - $m3[$q1[$q1[$q0[$q1[$j] ^ $key[32]] ^ $key[24]] ^ $key[16]] ^ $key[8]]; |
|
| 479 | + $m1[$q0[$q1[$q1[$q0[$j] ^ $key[30]] ^ $key[22]] ^ $key[14]] ^ $key[6]] ^ |
|
| 480 | + $m2[$q1[$q0[$q0[$q0[$j] ^ $key[31]] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^ |
|
| 481 | + $m3[$q1[$q1[$q0[$q1[$j] ^ $key[32]] ^ $key[24]] ^ $key[16]] ^ $key[8]]; |
|
| 482 | 482 | $B = ($B << 8) | ($B >> 24 & 0xff); |
| 483 | 483 | $K[] = $A+= $B; |
| 484 | 484 | $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff); |
@@ -570,25 +570,25 @@ discard block |
||
| 570 | 570 | $ki = 7; |
| 571 | 571 | while ($ki < 39) { |
| 572 | 572 | $t0 = $S0[ $R0 & 0xff] ^ |
| 573 | - $S1[($R0 >> 8) & 0xff] ^ |
|
| 574 | - $S2[($R0 >> 16) & 0xff] ^ |
|
| 575 | - $S3[($R0 >> 24) & 0xff]; |
|
| 573 | + $S1[($R0 >> 8) & 0xff] ^ |
|
| 574 | + $S2[($R0 >> 16) & 0xff] ^ |
|
| 575 | + $S3[($R0 >> 24) & 0xff]; |
|
| 576 | 576 | $t1 = $S0[($R1 >> 24) & 0xff] ^ |
| 577 | - $S1[ $R1 & 0xff] ^ |
|
| 578 | - $S2[($R1 >> 8) & 0xff] ^ |
|
| 579 | - $S3[($R1 >> 16) & 0xff]; |
|
| 577 | + $S1[ $R1 & 0xff] ^ |
|
| 578 | + $S2[($R1 >> 8) & 0xff] ^ |
|
| 579 | + $S3[($R1 >> 16) & 0xff]; |
|
| 580 | 580 | $R2^= $t0 + $t1 + $K[++$ki]; |
| 581 | 581 | $R2 = ($R2 >> 1 & 0x7fffffff) | ($R2 << 31); |
| 582 | 582 | $R3 = ((($R3 >> 31) & 1) | ($R3 << 1)) ^ ($t0 + ($t1 << 1) + $K[++$ki]); |
| 583 | 583 | |
| 584 | 584 | $t0 = $S0[ $R2 & 0xff] ^ |
| 585 | - $S1[($R2 >> 8) & 0xff] ^ |
|
| 586 | - $S2[($R2 >> 16) & 0xff] ^ |
|
| 587 | - $S3[($R2 >> 24) & 0xff]; |
|
| 585 | + $S1[($R2 >> 8) & 0xff] ^ |
|
| 586 | + $S2[($R2 >> 16) & 0xff] ^ |
|
| 587 | + $S3[($R2 >> 24) & 0xff]; |
|
| 588 | 588 | $t1 = $S0[($R3 >> 24) & 0xff] ^ |
| 589 | - $S1[ $R3 & 0xff] ^ |
|
| 590 | - $S2[($R3 >> 8) & 0xff] ^ |
|
| 591 | - $S3[($R3 >> 16) & 0xff]; |
|
| 589 | + $S1[ $R3 & 0xff] ^ |
|
| 590 | + $S2[($R3 >> 8) & 0xff] ^ |
|
| 591 | + $S3[($R3 >> 16) & 0xff]; |
|
| 592 | 592 | $R0^= ($t0 + $t1 + $K[++$ki]); |
| 593 | 593 | $R0 = ($R0 >> 1 & 0x7fffffff) | ($R0 << 31); |
| 594 | 594 | $R1 = ((($R1 >> 31) & 1) | ($R1 << 1)) ^ ($t0 + ($t1 << 1) + $K[++$ki]); |
@@ -596,9 +596,9 @@ discard block |
||
| 596 | 596 | |
| 597 | 597 | // @codingStandardsIgnoreStart |
| 598 | 598 | return pack("V4", $K[4] ^ $R2, |
| 599 | - $K[5] ^ $R3, |
|
| 600 | - $K[6] ^ $R0, |
|
| 601 | - $K[7] ^ $R1); |
|
| 599 | + $K[5] ^ $R3, |
|
| 600 | + $K[6] ^ $R0, |
|
| 601 | + $K[7] ^ $R1); |
|
| 602 | 602 | // @codingStandardsIgnoreEnd |
| 603 | 603 | } |
| 604 | 604 | |
@@ -626,25 +626,25 @@ discard block |
||
| 626 | 626 | $ki = 40; |
| 627 | 627 | while ($ki > 8) { |
| 628 | 628 | $t0 = $S0[$R0 & 0xff] ^ |
| 629 | - $S1[$R0 >> 8 & 0xff] ^ |
|
| 630 | - $S2[$R0 >> 16 & 0xff] ^ |
|
| 631 | - $S3[$R0 >> 24 & 0xff]; |
|
| 629 | + $S1[$R0 >> 8 & 0xff] ^ |
|
| 630 | + $S2[$R0 >> 16 & 0xff] ^ |
|
| 631 | + $S3[$R0 >> 24 & 0xff]; |
|
| 632 | 632 | $t1 = $S0[$R1 >> 24 & 0xff] ^ |
| 633 | - $S1[$R1 & 0xff] ^ |
|
| 634 | - $S2[$R1 >> 8 & 0xff] ^ |
|
| 635 | - $S3[$R1 >> 16 & 0xff]; |
|
| 633 | + $S1[$R1 & 0xff] ^ |
|
| 634 | + $S2[$R1 >> 8 & 0xff] ^ |
|
| 635 | + $S3[$R1 >> 16 & 0xff]; |
|
| 636 | 636 | $R3^= $t0 + ($t1 << 1) + $K[--$ki]; |
| 637 | 637 | $R3 = $R3 >> 1 & 0x7fffffff | $R3 << 31; |
| 638 | 638 | $R2 = ($R2 >> 31 & 0x1 | $R2 << 1) ^ ($t0 + $t1 + $K[--$ki]); |
| 639 | 639 | |
| 640 | 640 | $t0 = $S0[$R2 & 0xff] ^ |
| 641 | - $S1[$R2 >> 8 & 0xff] ^ |
|
| 642 | - $S2[$R2 >> 16 & 0xff] ^ |
|
| 643 | - $S3[$R2 >> 24 & 0xff]; |
|
| 641 | + $S1[$R2 >> 8 & 0xff] ^ |
|
| 642 | + $S2[$R2 >> 16 & 0xff] ^ |
|
| 643 | + $S3[$R2 >> 24 & 0xff]; |
|
| 644 | 644 | $t1 = $S0[$R3 >> 24 & 0xff] ^ |
| 645 | - $S1[$R3 & 0xff] ^ |
|
| 646 | - $S2[$R3 >> 8 & 0xff] ^ |
|
| 647 | - $S3[$R3 >> 16 & 0xff]; |
|
| 645 | + $S1[$R3 & 0xff] ^ |
|
| 646 | + $S2[$R3 >> 8 & 0xff] ^ |
|
| 647 | + $S3[$R3 >> 16 & 0xff]; |
|
| 648 | 648 | $R1^= $t0 + ($t1 << 1) + $K[--$ki]; |
| 649 | 649 | $R1 = $R1 >> 1 & 0x7fffffff | $R1 << 31; |
| 650 | 650 | $R0 = ($R0 >> 31 & 0x1 | $R0 << 1) ^ ($t0 + $t1 + $K[--$ki]); |
@@ -652,9 +652,9 @@ discard block |
||
| 652 | 652 | |
| 653 | 653 | // @codingStandardsIgnoreStart |
| 654 | 654 | return pack("V4", $K[0] ^ $R2, |
| 655 | - $K[1] ^ $R3, |
|
| 656 | - $K[2] ^ $R0, |
|
| 657 | - $K[3] ^ $R1); |
|
| 655 | + $K[1] ^ $R3, |
|
| 656 | + $K[2] ^ $R0, |
|
| 657 | + $K[3] ^ $R1); |
|
| 658 | 658 | // @codingStandardsIgnoreEnd |
| 659 | 659 | } |
| 660 | 660 | |
@@ -794,11 +794,11 @@ discard block |
||
| 794 | 794 | |
| 795 | 795 | $lambda_functions[$code_hash] = $this->_createInlineCryptFunction( |
| 796 | 796 | array( |
| 797 | - 'init_crypt' => $init_crypt, |
|
| 798 | - 'init_encrypt' => '', |
|
| 799 | - 'init_decrypt' => '', |
|
| 800 | - 'encrypt_block' => $encrypt_block, |
|
| 801 | - 'decrypt_block' => $decrypt_block |
|
| 797 | + 'init_crypt' => $init_crypt, |
|
| 798 | + 'init_encrypt' => '', |
|
| 799 | + 'init_decrypt' => '', |
|
| 800 | + 'encrypt_block' => $encrypt_block, |
|
| 801 | + 'decrypt_block' => $decrypt_block |
|
| 802 | 802 | ) |
| 803 | 803 | ); |
| 804 | 804 | } |
@@ -708,13 +708,13 @@ discard block |
||
| 708 | 708 | $t = unpack('Nl/Nr', $block); |
| 709 | 709 | list($l, $r) = array($t['l'], $t['r']); |
| 710 | 710 | $block = ($shuffleip[ $r & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") | |
| 711 | - ($shuffleip[($r >> 8) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") | |
|
| 712 | - ($shuffleip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") | |
|
| 713 | - ($shuffleip[($r >> 24) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") | |
|
| 714 | - ($shuffleip[ $l & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") | |
|
| 715 | - ($shuffleip[($l >> 8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") | |
|
| 716 | - ($shuffleip[($l >> 16) & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") | |
|
| 717 | - ($shuffleip[($l >> 24) & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01"); |
|
| 711 | + ($shuffleip[($r >> 8) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") | |
|
| 712 | + ($shuffleip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") | |
|
| 713 | + ($shuffleip[($r >> 24) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") | |
|
| 714 | + ($shuffleip[ $l & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") | |
|
| 715 | + ($shuffleip[($l >> 8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") | |
|
| 716 | + ($shuffleip[($l >> 16) & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") | |
|
| 717 | + ($shuffleip[($l >> 24) & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01"); |
|
| 718 | 718 | |
| 719 | 719 | // Extract L0 and R0. |
| 720 | 720 | $t = unpack('Nl/Nr', $block); |
@@ -731,9 +731,9 @@ discard block |
||
| 731 | 731 | |
| 732 | 732 | // S-box indexing. |
| 733 | 733 | $t = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^ |
| 734 | - $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^ |
|
| 735 | - $sbox5[($b1 >> 8) & 0x3F] ^ $sbox6[($b2 >> 8) & 0x3F] ^ |
|
| 736 | - $sbox7[ $b1 & 0x3F] ^ $sbox8[ $b2 & 0x3F] ^ $l; |
|
| 734 | + $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^ |
|
| 735 | + $sbox5[($b1 >> 8) & 0x3F] ^ $sbox6[($b2 >> 8) & 0x3F] ^ |
|
| 736 | + $sbox7[ $b1 & 0x3F] ^ $sbox8[ $b2 & 0x3F] ^ $l; |
|
| 737 | 737 | // end of "the Feistel (F) function" |
| 738 | 738 | |
| 739 | 739 | $l = $r; |
@@ -748,13 +748,13 @@ discard block |
||
| 748 | 748 | |
| 749 | 749 | // Perform the inverse IP permutation. |
| 750 | 750 | return ($shuffleinvip[($r >> 24) & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") | |
| 751 | - ($shuffleinvip[($l >> 24) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") | |
|
| 752 | - ($shuffleinvip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") | |
|
| 753 | - ($shuffleinvip[($l >> 16) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") | |
|
| 754 | - ($shuffleinvip[($r >> 8) & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") | |
|
| 755 | - ($shuffleinvip[($l >> 8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") | |
|
| 756 | - ($shuffleinvip[ $r & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") | |
|
| 757 | - ($shuffleinvip[ $l & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01"); |
|
| 751 | + ($shuffleinvip[($l >> 24) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") | |
|
| 752 | + ($shuffleinvip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") | |
|
| 753 | + ($shuffleinvip[($l >> 16) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") | |
|
| 754 | + ($shuffleinvip[($r >> 8) & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") | |
|
| 755 | + ($shuffleinvip[($l >> 8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") | |
|
| 756 | + ($shuffleinvip[ $r & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") | |
|
| 757 | + ($shuffleinvip[ $l & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01"); |
|
| 758 | 758 | } |
| 759 | 759 | |
| 760 | 760 | /** |
@@ -1229,13 +1229,13 @@ discard block |
||
| 1229 | 1229 | $t = unpack('Nl/Nr', $key); |
| 1230 | 1230 | list($l, $r) = array($t['l'], $t['r']); |
| 1231 | 1231 | $key = ($this->shuffle[$pc1map[ $r & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x00") | |
| 1232 | - ($this->shuffle[$pc1map[($r >> 8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x00") | |
|
| 1233 | - ($this->shuffle[$pc1map[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x00") | |
|
| 1234 | - ($this->shuffle[$pc1map[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x00") | |
|
| 1235 | - ($this->shuffle[$pc1map[ $l & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x00") | |
|
| 1236 | - ($this->shuffle[$pc1map[($l >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x00") | |
|
| 1237 | - ($this->shuffle[$pc1map[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x00") | |
|
| 1238 | - ($this->shuffle[$pc1map[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x00"); |
|
| 1232 | + ($this->shuffle[$pc1map[($r >> 8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x00") | |
|
| 1233 | + ($this->shuffle[$pc1map[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x00") | |
|
| 1234 | + ($this->shuffle[$pc1map[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x00") | |
|
| 1235 | + ($this->shuffle[$pc1map[ $l & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x00") | |
|
| 1236 | + ($this->shuffle[$pc1map[($l >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x00") | |
|
| 1237 | + ($this->shuffle[$pc1map[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x00") | |
|
| 1238 | + ($this->shuffle[$pc1map[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x00"); |
|
| 1239 | 1239 | $key = unpack('Nc/Nd', $key); |
| 1240 | 1240 | $c = ( $key['c'] >> 4) & 0x0FFFFFFF; |
| 1241 | 1241 | $d = (($key['d'] >> 4) & 0x0FFFFFF0) | ($key['c'] & 0x0F); |
@@ -1252,9 +1252,9 @@ discard block |
||
| 1252 | 1252 | |
| 1253 | 1253 | // Perform the PC-2 transformation. |
| 1254 | 1254 | $cp = $pc2mapc1[ $c >> 24 ] | $pc2mapc2[($c >> 16) & 0xFF] | |
| 1255 | - $pc2mapc3[($c >> 8) & 0xFF] | $pc2mapc4[ $c & 0xFF]; |
|
| 1255 | + $pc2mapc3[($c >> 8) & 0xFF] | $pc2mapc4[ $c & 0xFF]; |
|
| 1256 | 1256 | $dp = $pc2mapd1[ $d >> 24 ] | $pc2mapd2[($d >> 16) & 0xFF] | |
| 1257 | - $pc2mapd3[($d >> 8) & 0xFF] | $pc2mapd4[ $d & 0xFF]; |
|
| 1257 | + $pc2mapd3[($d >> 8) & 0xFF] | $pc2mapd4[ $d & 0xFF]; |
|
| 1258 | 1258 | |
| 1259 | 1259 | // Reorder: odd bytes/even bytes. Push the result in key schedule. |
| 1260 | 1260 | $val1 = ( $cp & 0xFF000000) | (($cp << 8) & 0x00FF0000) | |
@@ -1439,11 +1439,11 @@ discard block |
||
| 1439 | 1439 | // Creates the inline-crypt function |
| 1440 | 1440 | $lambda_functions[$code_hash] = $this->_createInlineCryptFunction( |
| 1441 | 1441 | array( |
| 1442 | - 'init_crypt' => $init_crypt, |
|
| 1443 | - 'init_encrypt' => $init_encrypt, |
|
| 1444 | - 'init_decrypt' => $init_decrypt, |
|
| 1445 | - 'encrypt_block' => $crypt_block[self::ENCRYPT], |
|
| 1446 | - 'decrypt_block' => $crypt_block[self::DECRYPT] |
|
| 1442 | + 'init_crypt' => $init_crypt, |
|
| 1443 | + 'init_encrypt' => $init_encrypt, |
|
| 1444 | + 'init_decrypt' => $init_decrypt, |
|
| 1445 | + 'encrypt_block' => $crypt_block[self::ENCRYPT], |
|
| 1446 | + 'decrypt_block' => $crypt_block[self::DECRYPT] |
|
| 1447 | 1447 | ) |
| 1448 | 1448 | ); |
| 1449 | 1449 | } |
@@ -403,9 +403,9 @@ discard block |
||
| 403 | 403 | // subWord |
| 404 | 404 | for ($i = 0; $i < $Nb; ++$i) { |
| 405 | 405 | $state[$i] = $sbox[$state[$i] & 0x000000FF] | |
| 406 | - ($sbox[$state[$i] >> 8 & 0x000000FF] << 8) | |
|
| 407 | - ($sbox[$state[$i] >> 16 & 0x000000FF] << 16) | |
|
| 408 | - ($sbox[$state[$i] >> 24 & 0x000000FF] << 24); |
|
| 406 | + ($sbox[$state[$i] >> 8 & 0x000000FF] << 8) | |
|
| 407 | + ($sbox[$state[$i] >> 16 & 0x000000FF] << 16) | |
|
| 408 | + ($sbox[$state[$i] >> 24 & 0x000000FF] << 24); |
|
| 409 | 409 | } |
| 410 | 410 | |
| 411 | 411 | // shiftRows + addRoundKey |
@@ -418,7 +418,7 @@ discard block |
||
| 418 | 418 | ($state[$j] & 0x00FF0000) ^ |
| 419 | 419 | ($state[$k] & 0x0000FF00) ^ |
| 420 | 420 | ($state[$l] & 0x000000FF) ^ |
| 421 | - $w[$i]; |
|
| 421 | + $w[$i]; |
|
| 422 | 422 | ++$i; |
| 423 | 423 | $j = ($j + 1) % $Nb; |
| 424 | 424 | $k = ($k + 1) % $Nb; |
@@ -506,9 +506,9 @@ discard block |
||
| 506 | 506 | ($state[$l] & 0x000000FF); |
| 507 | 507 | |
| 508 | 508 | $temp[$i] = $dw[$i] ^ ($isbox[$word & 0x000000FF] | |
| 509 | - ($isbox[$word >> 8 & 0x000000FF] << 8) | |
|
| 510 | - ($isbox[$word >> 16 & 0x000000FF] << 16) | |
|
| 511 | - ($isbox[$word >> 24 & 0x000000FF] << 24)); |
|
| 509 | + ($isbox[$word >> 8 & 0x000000FF] << 8) | |
|
| 510 | + ($isbox[$word >> 16 & 0x000000FF] << 16) | |
|
| 511 | + ($isbox[$word >> 24 & 0x000000FF] << 24)); |
|
| 512 | 512 | ++$i; |
| 513 | 513 | $j = ($j + 1) % $Nb; |
| 514 | 514 | $k = ($k + 1) % $Nb; |
@@ -658,9 +658,9 @@ discard block |
||
| 658 | 658 | } |
| 659 | 659 | |
| 660 | 660 | return $sbox[$word & 0x000000FF] | |
| 661 | - ($sbox[$word >> 8 & 0x000000FF] << 8) | |
|
| 662 | - ($sbox[$word >> 16 & 0x000000FF] << 16) | |
|
| 663 | - ($sbox[$word >> 24 & 0x000000FF] << 24); |
|
| 661 | + ($sbox[$word >> 8 & 0x000000FF] << 8) | |
|
| 662 | + ($sbox[$word >> 16 & 0x000000FF] << 16) | |
|
| 663 | + ($sbox[$word >> 24 & 0x000000FF] << 24); |
|
| 664 | 664 | } |
| 665 | 665 | |
| 666 | 666 | /** |
@@ -999,11 +999,11 @@ discard block |
||
| 999 | 999 | |
| 1000 | 1000 | $lambda_functions[$code_hash] = $this->_createInlineCryptFunction( |
| 1001 | 1001 | array( |
| 1002 | - 'init_crypt' => '', |
|
| 1003 | - 'init_encrypt' => $init_encrypt, |
|
| 1004 | - 'init_decrypt' => $init_decrypt, |
|
| 1005 | - 'encrypt_block' => $encrypt_block, |
|
| 1006 | - 'decrypt_block' => $decrypt_block |
|
| 1002 | + 'init_crypt' => '', |
|
| 1003 | + 'init_encrypt' => $init_encrypt, |
|
| 1004 | + 'init_decrypt' => $init_decrypt, |
|
| 1005 | + 'encrypt_block' => $encrypt_block, |
|
| 1006 | + 'decrypt_block' => $decrypt_block |
|
| 1007 | 1007 | ) |
| 1008 | 1008 | ); |
| 1009 | 1009 | } |
@@ -648,9 +648,9 @@ |
||
| 648 | 648 | // Creates the inline-crypt function |
| 649 | 649 | $lambda_functions[$code_hash] = $this->_createInlineCryptFunction( |
| 650 | 650 | array( |
| 651 | - 'init_crypt' => $init_crypt, |
|
| 652 | - 'encrypt_block' => $encrypt_block, |
|
| 653 | - 'decrypt_block' => $decrypt_block |
|
| 651 | + 'init_crypt' => $init_crypt, |
|
| 652 | + 'encrypt_block' => $encrypt_block, |
|
| 653 | + 'decrypt_block' => $decrypt_block |
|
| 654 | 654 | ) |
| 655 | 655 | ); |
| 656 | 656 | } |
@@ -411,13 +411,13 @@ discard block |
||
| 411 | 411 | $l^= $p[$i]; |
| 412 | 412 | $r^= ($sb_0[$l >> 24 & 0xff] + |
| 413 | 413 | $sb_1[$l >> 16 & 0xff] ^ |
| 414 | - $sb_2[$l >> 8 & 0xff]) + |
|
| 414 | + $sb_2[$l >> 8 & 0xff]) + |
|
| 415 | 415 | $sb_3[$l & 0xff]; |
| 416 | 416 | |
| 417 | 417 | $r^= $p[$i + 1]; |
| 418 | 418 | $l^= ($sb_0[$r >> 24 & 0xff] + |
| 419 | 419 | $sb_1[$r >> 16 & 0xff] ^ |
| 420 | - $sb_2[$r >> 8 & 0xff]) + |
|
| 420 | + $sb_2[$r >> 8 & 0xff]) + |
|
| 421 | 421 | $sb_3[$r & 0xff]; |
| 422 | 422 | } |
| 423 | 423 | return pack("N*", $r ^ $p[17], $l ^ $p[16]); |
@@ -446,13 +446,13 @@ discard block |
||
| 446 | 446 | $l^= $p[$i]; |
| 447 | 447 | $r^= ($sb_0[$l >> 24 & 0xff] + |
| 448 | 448 | $sb_1[$l >> 16 & 0xff] ^ |
| 449 | - $sb_2[$l >> 8 & 0xff]) + |
|
| 449 | + $sb_2[$l >> 8 & 0xff]) + |
|
| 450 | 450 | $sb_3[$l & 0xff]; |
| 451 | 451 | |
| 452 | 452 | $r^= $p[$i - 1]; |
| 453 | 453 | $l^= ($sb_0[$r >> 24 & 0xff] + |
| 454 | 454 | $sb_1[$r >> 16 & 0xff] ^ |
| 455 | - $sb_2[$r >> 8 & 0xff]) + |
|
| 455 | + $sb_2[$r >> 8 & 0xff]) + |
|
| 456 | 456 | $sb_3[$r & 0xff]; |
| 457 | 457 | } |
| 458 | 458 | return pack("N*", $r ^ $p[0], $l ^ $p[1]); |
@@ -565,11 +565,11 @@ discard block |
||
| 565 | 565 | |
| 566 | 566 | $lambda_functions[$code_hash] = $this->_createInlineCryptFunction( |
| 567 | 567 | array( |
| 568 | - 'init_crypt' => $init_crypt, |
|
| 569 | - 'init_encrypt' => '', |
|
| 570 | - 'init_decrypt' => '', |
|
| 571 | - 'encrypt_block' => $encrypt_block, |
|
| 572 | - 'decrypt_block' => $decrypt_block |
|
| 568 | + 'init_crypt' => $init_crypt, |
|
| 569 | + 'init_encrypt' => '', |
|
| 570 | + 'init_decrypt' => '', |
|
| 571 | + 'encrypt_block' => $encrypt_block, |
|
| 572 | + 'decrypt_block' => $decrypt_block |
|
| 573 | 573 | ) |
| 574 | 574 | ); |
| 575 | 575 | } |
@@ -438,8 +438,8 @@ discard block |
||
| 438 | 438 | if ($response === false) { |
| 439 | 439 | // from PuTTY's psftp.exe |
| 440 | 440 | $command = "test -x /usr/lib/sftp-server && exec /usr/lib/sftp-server\n" . |
| 441 | - "test -x /usr/local/lib/sftp-server && exec /usr/local/lib/sftp-server\n" . |
|
| 442 | - "exec sftp-server"; |
|
| 441 | + "test -x /usr/local/lib/sftp-server && exec /usr/local/lib/sftp-server\n" . |
|
| 442 | + "exec sftp-server"; |
|
| 443 | 443 | // we don't do $this->exec($command, false) because exec() operates on a different channel and plus the SSH_MSG_CHANNEL_OPEN that exec() does |
| 444 | 444 | // is redundant |
| 445 | 445 | $packet = pack( |
@@ -2678,7 +2678,7 @@ discard block |
||
| 2678 | 2678 | |
| 2679 | 2679 | if (defined('NET_SFTP_LOGGING')) { |
| 2680 | 2680 | $packet_type = '-> ' . $this->packet_types[$type] . |
| 2681 | - ' (' . round($stop - $start, 4) . 's)'; |
|
| 2681 | + ' (' . round($stop - $start, 4) . 's)'; |
|
| 2682 | 2682 | if (NET_SFTP_LOGGING == NET_SFTP_LOG_REALTIME) { |
| 2683 | 2683 | echo "<pre>\r\n" . $this->_format_log(array($data), array($packet_type)) . "\r\n</pre>\r\n"; |
| 2684 | 2684 | flush(); |
@@ -2754,7 +2754,7 @@ discard block |
||
| 2754 | 2754 | |
| 2755 | 2755 | if (defined('NET_SFTP_LOGGING')) { |
| 2756 | 2756 | $packet_type = '<- ' . $this->packet_types[$this->packet_type] . |
| 2757 | - ' (' . round($stop - $start, 4) . 's)'; |
|
| 2757 | + ' (' . round($stop - $start, 4) . 's)'; |
|
| 2758 | 2758 | if (NET_SFTP_LOGGING == NET_SFTP_LOG_REALTIME) { |
| 2759 | 2759 | echo "<pre>\r\n" . $this->_format_log(array($packet), array($packet_type)) . "\r\n</pre>\r\n"; |
| 2760 | 2760 | flush(); |
@@ -956,16 +956,16 @@ discard block |
||
| 956 | 956 | array(60 => 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ'), |
| 957 | 957 | array(60 => 'NET_SSH2_MSG_USERAUTH_PK_OK'), |
| 958 | 958 | array(60 => 'NET_SSH2_MSG_USERAUTH_INFO_REQUEST', |
| 959 | - 61 => 'NET_SSH2_MSG_USERAUTH_INFO_RESPONSE'), |
|
| 959 | + 61 => 'NET_SSH2_MSG_USERAUTH_INFO_RESPONSE'), |
|
| 960 | 960 | // RFC 4419 - diffie-hellman-group-exchange-sha{1,256} |
| 961 | 961 | array(30 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST_OLD', |
| 962 | - 31 => 'NET_SSH2_MSG_KEXDH_GEX_GROUP', |
|
| 963 | - 32 => 'NET_SSH2_MSG_KEXDH_GEX_INIT', |
|
| 964 | - 33 => 'NET_SSH2_MSG_KEXDH_GEX_REPLY', |
|
| 965 | - 34 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST'), |
|
| 962 | + 31 => 'NET_SSH2_MSG_KEXDH_GEX_GROUP', |
|
| 963 | + 32 => 'NET_SSH2_MSG_KEXDH_GEX_INIT', |
|
| 964 | + 33 => 'NET_SSH2_MSG_KEXDH_GEX_REPLY', |
|
| 965 | + 34 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST'), |
|
| 966 | 966 | // RFC 5656 - Elliptic Curves (for [email protected]) |
| 967 | 967 | array(30 => 'NET_SSH2_MSG_KEX_ECDH_INIT', |
| 968 | - 31 => 'NET_SSH2_MSG_KEX_ECDH_REPLY') |
|
| 968 | + 31 => 'NET_SSH2_MSG_KEX_ECDH_REPLY') |
|
| 969 | 969 | ); |
| 970 | 970 | |
| 971 | 971 | self::$connections[$this->getResourceId()] = $this; |
@@ -1207,7 +1207,7 @@ discard block |
||
| 1207 | 1207 | 'twofish192-cbc', // OPTIONAL Twofish with a 192-bit key |
| 1208 | 1208 | 'twofish256-cbc', |
| 1209 | 1209 | 'twofish-cbc', // OPTIONAL alias for "twofish256-cbc" |
| 1210 | - // (this is being retained for historical reasons) |
|
| 1210 | + // (this is being retained for historical reasons) |
|
| 1211 | 1211 | |
| 1212 | 1212 | 'blowfish-ctr', // OPTIONAL Blowfish in SDCTR mode |
| 1213 | 1213 | |
@@ -2946,7 +2946,7 @@ discard block |
||
| 2946 | 2946 | $current = microtime(true); |
| 2947 | 2947 | $message_number = isset($this->message_numbers[ord($payload[0])]) ? $this->message_numbers[ord($payload[0])] : 'UNKNOWN (' . ord($payload[0]) . ')'; |
| 2948 | 2948 | $message_number = '<- ' . $message_number . |
| 2949 | - ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)'; |
|
| 2949 | + ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)'; |
|
| 2950 | 2950 | $this->_append_log($message_number, $payload); |
| 2951 | 2951 | $this->last_packet = $current; |
| 2952 | 2952 | } |
@@ -3421,7 +3421,7 @@ discard block |
||
| 3421 | 3421 | $current = microtime(true); |
| 3422 | 3422 | $message_number = isset($this->message_numbers[ord($data[0])]) ? $this->message_numbers[ord($data[0])] : 'UNKNOWN (' . ord($data[0]) . ')'; |
| 3423 | 3423 | $message_number = '-> ' . $message_number . |
| 3424 | - ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)'; |
|
| 3424 | + ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)'; |
|
| 3425 | 3425 | $this->_append_log($message_number, isset($logged) ? $logged : $data); |
| 3426 | 3426 | $this->last_packet = $current; |
| 3427 | 3427 | } |
@@ -386,10 +386,10 @@ discard block |
||
| 386 | 386 | 'children' => array( |
| 387 | 387 | 'extnId' => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER), |
| 388 | 388 | 'critical' => array( |
| 389 | - 'type' => ASN1::TYPE_BOOLEAN, |
|
| 390 | - 'optional' => true, |
|
| 391 | - 'default' => false |
|
| 392 | - ), |
|
| 389 | + 'type' => ASN1::TYPE_BOOLEAN, |
|
| 390 | + 'optional' => true, |
|
| 391 | + 'default' => false |
|
| 392 | + ), |
|
| 393 | 393 | 'extnValue' => array('type' => ASN1::TYPE_OCTET_STRING) |
| 394 | 394 | ) |
| 395 | 395 | ); |
@@ -444,11 +444,11 @@ discard block |
||
| 444 | 444 | // technically, default implies optional, but we'll define it as being optional, none-the-less, just to |
| 445 | 445 | // reenforce that fact |
| 446 | 446 | 'version' => array( |
| 447 | - 'constant' => 0, |
|
| 448 | - 'optional' => true, |
|
| 449 | - 'explicit' => true, |
|
| 450 | - 'default' => 'v1' |
|
| 451 | - ) + $Version, |
|
| 447 | + 'constant' => 0, |
|
| 448 | + 'optional' => true, |
|
| 449 | + 'explicit' => true, |
|
| 450 | + 'default' => 'v1' |
|
| 451 | + ) + $Version, |
|
| 452 | 452 | 'serialNumber' => $CertificateSerialNumber, |
| 453 | 453 | 'signature' => $AlgorithmIdentifier, |
| 454 | 454 | 'issuer' => $this->Name, |
@@ -457,31 +457,31 @@ discard block |
||
| 457 | 457 | 'subjectPublicKeyInfo' => $SubjectPublicKeyInfo, |
| 458 | 458 | // implicit means that the T in the TLV structure is to be rewritten, regardless of the type |
| 459 | 459 | 'issuerUniqueID' => array( |
| 460 | - 'constant' => 1, |
|
| 461 | - 'optional' => true, |
|
| 462 | - 'implicit' => true |
|
| 463 | - ) + $UniqueIdentifier, |
|
| 460 | + 'constant' => 1, |
|
| 461 | + 'optional' => true, |
|
| 462 | + 'implicit' => true |
|
| 463 | + ) + $UniqueIdentifier, |
|
| 464 | 464 | 'subjectUniqueID' => array( |
| 465 | - 'constant' => 2, |
|
| 466 | - 'optional' => true, |
|
| 467 | - 'implicit' => true |
|
| 468 | - ) + $UniqueIdentifier, |
|
| 465 | + 'constant' => 2, |
|
| 466 | + 'optional' => true, |
|
| 467 | + 'implicit' => true |
|
| 468 | + ) + $UniqueIdentifier, |
|
| 469 | 469 | // <http://tools.ietf.org/html/rfc2459#page-74> doesn't use the EXPLICIT keyword but if |
| 470 | 470 | // it's not IMPLICIT, it's EXPLICIT |
| 471 | 471 | 'extensions' => array( |
| 472 | - 'constant' => 3, |
|
| 473 | - 'optional' => true, |
|
| 474 | - 'explicit' => true |
|
| 475 | - ) + $this->Extensions |
|
| 472 | + 'constant' => 3, |
|
| 473 | + 'optional' => true, |
|
| 474 | + 'explicit' => true |
|
| 475 | + ) + $this->Extensions |
|
| 476 | 476 | ) |
| 477 | 477 | ); |
| 478 | 478 | |
| 479 | 479 | $this->Certificate = array( |
| 480 | 480 | 'type' => ASN1::TYPE_SEQUENCE, |
| 481 | 481 | 'children' => array( |
| 482 | - 'tbsCertificate' => $TBSCertificate, |
|
| 483 | - 'signatureAlgorithm' => $AlgorithmIdentifier, |
|
| 484 | - 'signature' => array('type' => ASN1::TYPE_BIT_STRING) |
|
| 482 | + 'tbsCertificate' => $TBSCertificate, |
|
| 483 | + 'signatureAlgorithm' => $AlgorithmIdentifier, |
|
| 484 | + 'signature' => array('type' => ASN1::TYPE_BIT_STRING) |
|
| 485 | 485 | ) |
| 486 | 486 | ); |
| 487 | 487 | |
@@ -504,14 +504,14 @@ discard block |
||
| 504 | 504 | 'type' => ASN1::TYPE_SEQUENCE, |
| 505 | 505 | 'children' => array( |
| 506 | 506 | 'cA' => array( |
| 507 | - 'type' => ASN1::TYPE_BOOLEAN, |
|
| 508 | - 'optional' => true, |
|
| 509 | - 'default' => false |
|
| 510 | - ), |
|
| 507 | + 'type' => ASN1::TYPE_BOOLEAN, |
|
| 508 | + 'optional' => true, |
|
| 509 | + 'default' => false |
|
| 510 | + ), |
|
| 511 | 511 | 'pathLenConstraint' => array( |
| 512 | - 'type' => ASN1::TYPE_INTEGER, |
|
| 513 | - 'optional' => true |
|
| 514 | - ) |
|
| 512 | + 'type' => ASN1::TYPE_INTEGER, |
|
| 513 | + 'optional' => true |
|
| 514 | + ) |
|
| 515 | 515 | ) |
| 516 | 516 | ); |
| 517 | 517 | |
@@ -528,29 +528,29 @@ discard block |
||
| 528 | 528 | 'type' => ASN1::TYPE_SET, |
| 529 | 529 | 'children' => array( |
| 530 | 530 | 'surname' => array( |
| 531 | - 'type' => ASN1::TYPE_PRINTABLE_STRING, |
|
| 532 | - 'constant' => 0, |
|
| 533 | - 'optional' => true, |
|
| 534 | - 'implicit' => true |
|
| 535 | - ), |
|
| 531 | + 'type' => ASN1::TYPE_PRINTABLE_STRING, |
|
| 532 | + 'constant' => 0, |
|
| 533 | + 'optional' => true, |
|
| 534 | + 'implicit' => true |
|
| 535 | + ), |
|
| 536 | 536 | 'given-name' => array( |
| 537 | - 'type' => ASN1::TYPE_PRINTABLE_STRING, |
|
| 538 | - 'constant' => 1, |
|
| 539 | - 'optional' => true, |
|
| 540 | - 'implicit' => true |
|
| 541 | - ), |
|
| 537 | + 'type' => ASN1::TYPE_PRINTABLE_STRING, |
|
| 538 | + 'constant' => 1, |
|
| 539 | + 'optional' => true, |
|
| 540 | + 'implicit' => true |
|
| 541 | + ), |
|
| 542 | 542 | 'initials' => array( |
| 543 | - 'type' => ASN1::TYPE_PRINTABLE_STRING, |
|
| 544 | - 'constant' => 2, |
|
| 545 | - 'optional' => true, |
|
| 546 | - 'implicit' => true |
|
| 547 | - ), |
|
| 543 | + 'type' => ASN1::TYPE_PRINTABLE_STRING, |
|
| 544 | + 'constant' => 2, |
|
| 545 | + 'optional' => true, |
|
| 546 | + 'implicit' => true |
|
| 547 | + ), |
|
| 548 | 548 | 'generation-qualifier' => array( |
| 549 | - 'type' => ASN1::TYPE_PRINTABLE_STRING, |
|
| 550 | - 'constant' => 3, |
|
| 551 | - 'optional' => true, |
|
| 552 | - 'implicit' => true |
|
| 553 | - ) |
|
| 549 | + 'type' => ASN1::TYPE_PRINTABLE_STRING, |
|
| 550 | + 'constant' => 3, |
|
| 551 | + 'optional' => true, |
|
| 552 | + 'implicit' => true |
|
| 553 | + ) |
|
| 554 | 554 | ) |
| 555 | 555 | ); |
| 556 | 556 | |
@@ -597,26 +597,26 @@ discard block |
||
| 597 | 597 | $AnotherName = array( |
| 598 | 598 | 'type' => ASN1::TYPE_SEQUENCE, |
| 599 | 599 | 'children' => array( |
| 600 | - 'type-id' => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER), |
|
| 601 | - 'value' => array( |
|
| 602 | - 'type' => ASN1::TYPE_ANY, |
|
| 603 | - 'constant' => 0, |
|
| 604 | - 'optional' => true, |
|
| 605 | - 'explicit' => true |
|
| 606 | - ) |
|
| 600 | + 'type-id' => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER), |
|
| 601 | + 'value' => array( |
|
| 602 | + 'type' => ASN1::TYPE_ANY, |
|
| 603 | + 'constant' => 0, |
|
| 604 | + 'optional' => true, |
|
| 605 | + 'explicit' => true |
|
| 606 | + ) |
|
| 607 | 607 | ) |
| 608 | 608 | ); |
| 609 | 609 | |
| 610 | 610 | $ExtensionAttribute = array( |
| 611 | 611 | 'type' => ASN1::TYPE_SEQUENCE, |
| 612 | 612 | 'children' => array( |
| 613 | - 'extension-attribute-type' => array( |
|
| 613 | + 'extension-attribute-type' => array( |
|
| 614 | 614 | 'type' => ASN1::TYPE_PRINTABLE_STRING, |
| 615 | 615 | 'constant' => 0, |
| 616 | 616 | 'optional' => true, |
| 617 | 617 | 'implicit' => true |
| 618 | 618 | ), |
| 619 | - 'extension-attribute-value' => array( |
|
| 619 | + 'extension-attribute-value' => array( |
|
| 620 | 620 | 'type' => ASN1::TYPE_ANY, |
| 621 | 621 | 'constant' => 1, |
| 622 | 622 | 'optional' => true, |
@@ -635,8 +635,8 @@ discard block |
||
| 635 | 635 | $BuiltInDomainDefinedAttribute = array( |
| 636 | 636 | 'type' => ASN1::TYPE_SEQUENCE, |
| 637 | 637 | 'children' => array( |
| 638 | - 'type' => array('type' => ASN1::TYPE_PRINTABLE_STRING), |
|
| 639 | - 'value' => array('type' => ASN1::TYPE_PRINTABLE_STRING) |
|
| 638 | + 'type' => array('type' => ASN1::TYPE_PRINTABLE_STRING), |
|
| 639 | + 'value' => array('type' => ASN1::TYPE_PRINTABLE_STRING) |
|
| 640 | 640 | ) |
| 641 | 641 | ); |
| 642 | 642 | |
@@ -653,63 +653,63 @@ discard block |
||
| 653 | 653 | 'country-name' => array('optional' => true) + $CountryName, |
| 654 | 654 | 'administration-domain-name' => array('optional' => true) + $AdministrationDomainName, |
| 655 | 655 | 'network-address' => array( |
| 656 | - 'constant' => 0, |
|
| 657 | - 'optional' => true, |
|
| 658 | - 'implicit' => true |
|
| 659 | - ) + $NetworkAddress, |
|
| 656 | + 'constant' => 0, |
|
| 657 | + 'optional' => true, |
|
| 658 | + 'implicit' => true |
|
| 659 | + ) + $NetworkAddress, |
|
| 660 | 660 | 'terminal-identifier' => array( |
| 661 | - 'constant' => 1, |
|
| 662 | - 'optional' => true, |
|
| 663 | - 'implicit' => true |
|
| 664 | - ) + $TerminalIdentifier, |
|
| 661 | + 'constant' => 1, |
|
| 662 | + 'optional' => true, |
|
| 663 | + 'implicit' => true |
|
| 664 | + ) + $TerminalIdentifier, |
|
| 665 | 665 | 'private-domain-name' => array( |
| 666 | - 'constant' => 2, |
|
| 667 | - 'optional' => true, |
|
| 668 | - 'explicit' => true |
|
| 669 | - ) + $PrivateDomainName, |
|
| 666 | + 'constant' => 2, |
|
| 667 | + 'optional' => true, |
|
| 668 | + 'explicit' => true |
|
| 669 | + ) + $PrivateDomainName, |
|
| 670 | 670 | 'organization-name' => array( |
| 671 | - 'constant' => 3, |
|
| 672 | - 'optional' => true, |
|
| 673 | - 'implicit' => true |
|
| 674 | - ) + $OrganizationName, |
|
| 671 | + 'constant' => 3, |
|
| 672 | + 'optional' => true, |
|
| 673 | + 'implicit' => true |
|
| 674 | + ) + $OrganizationName, |
|
| 675 | 675 | 'numeric-user-identifier' => array( |
| 676 | - 'constant' => 4, |
|
| 677 | - 'optional' => true, |
|
| 678 | - 'implicit' => true |
|
| 679 | - ) + $NumericUserIdentifier, |
|
| 676 | + 'constant' => 4, |
|
| 677 | + 'optional' => true, |
|
| 678 | + 'implicit' => true |
|
| 679 | + ) + $NumericUserIdentifier, |
|
| 680 | 680 | 'personal-name' => array( |
| 681 | - 'constant' => 5, |
|
| 682 | - 'optional' => true, |
|
| 683 | - 'implicit' => true |
|
| 684 | - ) + $PersonalName, |
|
| 681 | + 'constant' => 5, |
|
| 682 | + 'optional' => true, |
|
| 683 | + 'implicit' => true |
|
| 684 | + ) + $PersonalName, |
|
| 685 | 685 | 'organizational-unit-names' => array( |
| 686 | - 'constant' => 6, |
|
| 687 | - 'optional' => true, |
|
| 688 | - 'implicit' => true |
|
| 689 | - ) + $OrganizationalUnitNames |
|
| 686 | + 'constant' => 6, |
|
| 687 | + 'optional' => true, |
|
| 688 | + 'implicit' => true |
|
| 689 | + ) + $OrganizationalUnitNames |
|
| 690 | 690 | ) |
| 691 | 691 | ); |
| 692 | 692 | |
| 693 | 693 | $ORAddress = array( |
| 694 | 694 | 'type' => ASN1::TYPE_SEQUENCE, |
| 695 | 695 | 'children' => array( |
| 696 | - 'built-in-standard-attributes' => $BuiltInStandardAttributes, |
|
| 697 | - 'built-in-domain-defined-attributes' => array('optional' => true) + $BuiltInDomainDefinedAttributes, |
|
| 698 | - 'extension-attributes' => array('optional' => true) + $ExtensionAttributes |
|
| 696 | + 'built-in-standard-attributes' => $BuiltInStandardAttributes, |
|
| 697 | + 'built-in-domain-defined-attributes' => array('optional' => true) + $BuiltInDomainDefinedAttributes, |
|
| 698 | + 'extension-attributes' => array('optional' => true) + $ExtensionAttributes |
|
| 699 | 699 | ) |
| 700 | 700 | ); |
| 701 | 701 | |
| 702 | 702 | $EDIPartyName = array( |
| 703 | 703 | 'type' => ASN1::TYPE_SEQUENCE, |
| 704 | 704 | 'children' => array( |
| 705 | - 'nameAssigner' => array( |
|
| 705 | + 'nameAssigner' => array( |
|
| 706 | 706 | 'constant' => 0, |
| 707 | 707 | 'optional' => true, |
| 708 | 708 | 'implicit' => true |
| 709 | 709 | ) + $this->DirectoryString, |
| 710 | - // partyName is technically required but \phpseclib\File\ASN1 doesn't currently support non-optional constants and |
|
| 711 | - // setting it to optional gets the job done in any event. |
|
| 712 | - 'partyName' => array( |
|
| 710 | + // partyName is technically required but \phpseclib\File\ASN1 doesn't currently support non-optional constants and |
|
| 711 | + // setting it to optional gets the job done in any event. |
|
| 712 | + 'partyName' => array( |
|
| 713 | 713 | 'constant' => 1, |
| 714 | 714 | 'optional' => true, |
| 715 | 715 | 'implicit' => true |
@@ -721,55 +721,55 @@ discard block |
||
| 721 | 721 | 'type' => ASN1::TYPE_CHOICE, |
| 722 | 722 | 'children' => array( |
| 723 | 723 | 'otherName' => array( |
| 724 | - 'constant' => 0, |
|
| 725 | - 'optional' => true, |
|
| 726 | - 'implicit' => true |
|
| 727 | - ) + $AnotherName, |
|
| 724 | + 'constant' => 0, |
|
| 725 | + 'optional' => true, |
|
| 726 | + 'implicit' => true |
|
| 727 | + ) + $AnotherName, |
|
| 728 | 728 | 'rfc822Name' => array( |
| 729 | - 'type' => ASN1::TYPE_IA5_STRING, |
|
| 730 | - 'constant' => 1, |
|
| 731 | - 'optional' => true, |
|
| 732 | - 'implicit' => true |
|
| 733 | - ), |
|
| 729 | + 'type' => ASN1::TYPE_IA5_STRING, |
|
| 730 | + 'constant' => 1, |
|
| 731 | + 'optional' => true, |
|
| 732 | + 'implicit' => true |
|
| 733 | + ), |
|
| 734 | 734 | 'dNSName' => array( |
| 735 | - 'type' => ASN1::TYPE_IA5_STRING, |
|
| 736 | - 'constant' => 2, |
|
| 737 | - 'optional' => true, |
|
| 738 | - 'implicit' => true |
|
| 739 | - ), |
|
| 735 | + 'type' => ASN1::TYPE_IA5_STRING, |
|
| 736 | + 'constant' => 2, |
|
| 737 | + 'optional' => true, |
|
| 738 | + 'implicit' => true |
|
| 739 | + ), |
|
| 740 | 740 | 'x400Address' => array( |
| 741 | - 'constant' => 3, |
|
| 742 | - 'optional' => true, |
|
| 743 | - 'implicit' => true |
|
| 744 | - ) + $ORAddress, |
|
| 741 | + 'constant' => 3, |
|
| 742 | + 'optional' => true, |
|
| 743 | + 'implicit' => true |
|
| 744 | + ) + $ORAddress, |
|
| 745 | 745 | 'directoryName' => array( |
| 746 | - 'constant' => 4, |
|
| 747 | - 'optional' => true, |
|
| 748 | - 'explicit' => true |
|
| 749 | - ) + $this->Name, |
|
| 746 | + 'constant' => 4, |
|
| 747 | + 'optional' => true, |
|
| 748 | + 'explicit' => true |
|
| 749 | + ) + $this->Name, |
|
| 750 | 750 | 'ediPartyName' => array( |
| 751 | - 'constant' => 5, |
|
| 752 | - 'optional' => true, |
|
| 753 | - 'implicit' => true |
|
| 754 | - ) + $EDIPartyName, |
|
| 751 | + 'constant' => 5, |
|
| 752 | + 'optional' => true, |
|
| 753 | + 'implicit' => true |
|
| 754 | + ) + $EDIPartyName, |
|
| 755 | 755 | 'uniformResourceIdentifier' => array( |
| 756 | - 'type' => ASN1::TYPE_IA5_STRING, |
|
| 757 | - 'constant' => 6, |
|
| 758 | - 'optional' => true, |
|
| 759 | - 'implicit' => true |
|
| 760 | - ), |
|
| 756 | + 'type' => ASN1::TYPE_IA5_STRING, |
|
| 757 | + 'constant' => 6, |
|
| 758 | + 'optional' => true, |
|
| 759 | + 'implicit' => true |
|
| 760 | + ), |
|
| 761 | 761 | 'iPAddress' => array( |
| 762 | - 'type' => ASN1::TYPE_OCTET_STRING, |
|
| 763 | - 'constant' => 7, |
|
| 764 | - 'optional' => true, |
|
| 765 | - 'implicit' => true |
|
| 766 | - ), |
|
| 762 | + 'type' => ASN1::TYPE_OCTET_STRING, |
|
| 763 | + 'constant' => 7, |
|
| 764 | + 'optional' => true, |
|
| 765 | + 'implicit' => true |
|
| 766 | + ), |
|
| 767 | 767 | 'registeredID' => array( |
| 768 | - 'type' => ASN1::TYPE_OBJECT_IDENTIFIER, |
|
| 769 | - 'constant' => 8, |
|
| 770 | - 'optional' => true, |
|
| 771 | - 'implicit' => true |
|
| 772 | - ) |
|
| 768 | + 'type' => ASN1::TYPE_OBJECT_IDENTIFIER, |
|
| 769 | + 'constant' => 8, |
|
| 770 | + 'optional' => true, |
|
| 771 | + 'implicit' => true |
|
| 772 | + ) |
|
| 773 | 773 | ) |
| 774 | 774 | ); |
| 775 | 775 | |
@@ -801,15 +801,15 @@ discard block |
||
| 801 | 801 | 'type' => ASN1::TYPE_CHOICE, |
| 802 | 802 | 'children' => array( |
| 803 | 803 | 'fullName' => array( |
| 804 | - 'constant' => 0, |
|
| 805 | - 'optional' => true, |
|
| 806 | - 'implicit' => true |
|
| 807 | - ) + $GeneralNames, |
|
| 804 | + 'constant' => 0, |
|
| 805 | + 'optional' => true, |
|
| 806 | + 'implicit' => true |
|
| 807 | + ) + $GeneralNames, |
|
| 808 | 808 | 'nameRelativeToCRLIssuer' => array( |
| 809 | - 'constant' => 1, |
|
| 810 | - 'optional' => true, |
|
| 811 | - 'implicit' => true |
|
| 812 | - ) + $this->RelativeDistinguishedName |
|
| 809 | + 'constant' => 1, |
|
| 810 | + 'optional' => true, |
|
| 811 | + 'implicit' => true |
|
| 812 | + ) + $this->RelativeDistinguishedName |
|
| 813 | 813 | ) |
| 814 | 814 | ); |
| 815 | 815 | |
@@ -817,20 +817,20 @@ discard block |
||
| 817 | 817 | 'type' => ASN1::TYPE_SEQUENCE, |
| 818 | 818 | 'children' => array( |
| 819 | 819 | 'distributionPoint' => array( |
| 820 | - 'constant' => 0, |
|
| 821 | - 'optional' => true, |
|
| 822 | - 'explicit' => true |
|
| 823 | - ) + $DistributionPointName, |
|
| 820 | + 'constant' => 0, |
|
| 821 | + 'optional' => true, |
|
| 822 | + 'explicit' => true |
|
| 823 | + ) + $DistributionPointName, |
|
| 824 | 824 | 'reasons' => array( |
| 825 | - 'constant' => 1, |
|
| 826 | - 'optional' => true, |
|
| 827 | - 'implicit' => true |
|
| 828 | - ) + $ReasonFlags, |
|
| 825 | + 'constant' => 1, |
|
| 826 | + 'optional' => true, |
|
| 827 | + 'implicit' => true |
|
| 828 | + ) + $ReasonFlags, |
|
| 829 | 829 | 'cRLIssuer' => array( |
| 830 | - 'constant' => 2, |
|
| 831 | - 'optional' => true, |
|
| 832 | - 'implicit' => true |
|
| 833 | - ) + $GeneralNames |
|
| 830 | + 'constant' => 2, |
|
| 831 | + 'optional' => true, |
|
| 832 | + 'implicit' => true |
|
| 833 | + ) + $GeneralNames |
|
| 834 | 834 | ) |
| 835 | 835 | ); |
| 836 | 836 | |
@@ -845,20 +845,20 @@ discard block |
||
| 845 | 845 | 'type' => ASN1::TYPE_SEQUENCE, |
| 846 | 846 | 'children' => array( |
| 847 | 847 | 'keyIdentifier' => array( |
| 848 | - 'constant' => 0, |
|
| 849 | - 'optional' => true, |
|
| 850 | - 'implicit' => true |
|
| 851 | - ) + $this->KeyIdentifier, |
|
| 848 | + 'constant' => 0, |
|
| 849 | + 'optional' => true, |
|
| 850 | + 'implicit' => true |
|
| 851 | + ) + $this->KeyIdentifier, |
|
| 852 | 852 | 'authorityCertIssuer' => array( |
| 853 | - 'constant' => 1, |
|
| 854 | - 'optional' => true, |
|
| 855 | - 'implicit' => true |
|
| 856 | - ) + $GeneralNames, |
|
| 853 | + 'constant' => 1, |
|
| 854 | + 'optional' => true, |
|
| 855 | + 'implicit' => true |
|
| 856 | + ) + $GeneralNames, |
|
| 857 | 857 | 'authorityCertSerialNumber' => array( |
| 858 | - 'constant' => 2, |
|
| 859 | - 'optional' => true, |
|
| 860 | - 'implicit' => true |
|
| 861 | - ) + $CertificateSerialNumber |
|
| 858 | + 'constant' => 2, |
|
| 859 | + 'optional' => true, |
|
| 860 | + 'implicit' => true |
|
| 861 | + ) + $CertificateSerialNumber |
|
| 862 | 862 | ) |
| 863 | 863 | ); |
| 864 | 864 | |
@@ -879,12 +879,12 @@ discard block |
||
| 879 | 879 | 'children' => array( |
| 880 | 880 | 'policyIdentifier' => $CertPolicyId, |
| 881 | 881 | 'policyQualifiers' => array( |
| 882 | - 'type' => ASN1::TYPE_SEQUENCE, |
|
| 883 | - 'min' => 0, |
|
| 884 | - 'max' => -1, |
|
| 885 | - 'optional' => true, |
|
| 886 | - 'children' => $PolicyQualifierInfo |
|
| 887 | - ) |
|
| 882 | + 'type' => ASN1::TYPE_SEQUENCE, |
|
| 883 | + 'min' => 0, |
|
| 884 | + 'max' => -1, |
|
| 885 | + 'optional' => true, |
|
| 886 | + 'children' => $PolicyQualifierInfo |
|
| 887 | + ) |
|
| 888 | 888 | ) |
| 889 | 889 | ); |
| 890 | 890 | |
@@ -900,12 +900,12 @@ discard block |
||
| 900 | 900 | 'min' => 1, |
| 901 | 901 | 'max' => -1, |
| 902 | 902 | 'children' => array( |
| 903 | - 'type' => ASN1::TYPE_SEQUENCE, |
|
| 904 | - 'children' => array( |
|
| 905 | - 'issuerDomainPolicy' => $CertPolicyId, |
|
| 906 | - 'subjectDomainPolicy' => $CertPolicyId |
|
| 907 | - ) |
|
| 908 | - ) |
|
| 903 | + 'type' => ASN1::TYPE_SEQUENCE, |
|
| 904 | + 'children' => array( |
|
| 905 | + 'issuerDomainPolicy' => $CertPolicyId, |
|
| 906 | + 'subjectDomainPolicy' => $CertPolicyId |
|
| 907 | + ) |
|
| 908 | + ) |
|
| 909 | 909 | ); |
| 910 | 910 | |
| 911 | 911 | $KeyPurposeId = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER); |
@@ -938,15 +938,15 @@ discard block |
||
| 938 | 938 | 'type' => ASN1::TYPE_SEQUENCE, |
| 939 | 939 | 'children' => array( |
| 940 | 940 | 'notBefore' => array( |
| 941 | - 'constant' => 0, |
|
| 942 | - 'optional' => true, |
|
| 943 | - 'implicit' => true, |
|
| 944 | - 'type' => ASN1::TYPE_GENERALIZED_TIME), |
|
| 941 | + 'constant' => 0, |
|
| 942 | + 'optional' => true, |
|
| 943 | + 'implicit' => true, |
|
| 944 | + 'type' => ASN1::TYPE_GENERALIZED_TIME), |
|
| 945 | 945 | 'notAfter' => array( |
| 946 | - 'constant' => 1, |
|
| 947 | - 'optional' => true, |
|
| 948 | - 'implicit' => true, |
|
| 949 | - 'type' => ASN1::TYPE_GENERALIZED_TIME) |
|
| 946 | + 'constant' => 1, |
|
| 947 | + 'optional' => true, |
|
| 948 | + 'implicit' => true, |
|
| 949 | + 'type' => ASN1::TYPE_GENERALIZED_TIME) |
|
| 950 | 950 | ) |
| 951 | 951 | ); |
| 952 | 952 | |
@@ -957,16 +957,16 @@ discard block |
||
| 957 | 957 | 'children' => array( |
| 958 | 958 | 'base' => $GeneralName, |
| 959 | 959 | 'minimum' => array( |
| 960 | - 'constant' => 0, |
|
| 961 | - 'optional' => true, |
|
| 962 | - 'implicit' => true, |
|
| 963 | - 'default' => new BigInteger(0) |
|
| 964 | - ) + $BaseDistance, |
|
| 960 | + 'constant' => 0, |
|
| 961 | + 'optional' => true, |
|
| 962 | + 'implicit' => true, |
|
| 963 | + 'default' => new BigInteger(0) |
|
| 964 | + ) + $BaseDistance, |
|
| 965 | 965 | 'maximum' => array( |
| 966 | - 'constant' => 1, |
|
| 967 | - 'optional' => true, |
|
| 968 | - 'implicit' => true, |
|
| 969 | - ) + $BaseDistance |
|
| 966 | + 'constant' => 1, |
|
| 967 | + 'optional' => true, |
|
| 968 | + 'implicit' => true, |
|
| 969 | + ) + $BaseDistance |
|
| 970 | 970 | ) |
| 971 | 971 | ); |
| 972 | 972 | |
@@ -981,15 +981,15 @@ discard block |
||
| 981 | 981 | 'type' => ASN1::TYPE_SEQUENCE, |
| 982 | 982 | 'children' => array( |
| 983 | 983 | 'permittedSubtrees' => array( |
| 984 | - 'constant' => 0, |
|
| 985 | - 'optional' => true, |
|
| 986 | - 'implicit' => true |
|
| 987 | - ) + $GeneralSubtrees, |
|
| 984 | + 'constant' => 0, |
|
| 985 | + 'optional' => true, |
|
| 986 | + 'implicit' => true |
|
| 987 | + ) + $GeneralSubtrees, |
|
| 988 | 988 | 'excludedSubtrees' => array( |
| 989 | - 'constant' => 1, |
|
| 990 | - 'optional' => true, |
|
| 991 | - 'implicit' => true |
|
| 992 | - ) + $GeneralSubtrees |
|
| 989 | + 'constant' => 1, |
|
| 990 | + 'optional' => true, |
|
| 991 | + 'implicit' => true |
|
| 992 | + ) + $GeneralSubtrees |
|
| 993 | 993 | ) |
| 994 | 994 | ); |
| 995 | 995 | |
@@ -1010,11 +1010,11 @@ discard block |
||
| 1010 | 1010 | 'children' => array( |
| 1011 | 1011 | 'organization' => $DisplayText, |
| 1012 | 1012 | 'noticeNumbers' => array( |
| 1013 | - 'type' => ASN1::TYPE_SEQUENCE, |
|
| 1014 | - 'min' => 1, |
|
| 1015 | - 'max' => 200, |
|
| 1016 | - 'children' => array('type' => ASN1::TYPE_INTEGER) |
|
| 1017 | - ) |
|
| 1013 | + 'type' => ASN1::TYPE_SEQUENCE, |
|
| 1014 | + 'min' => 1, |
|
| 1015 | + 'max' => 200, |
|
| 1016 | + 'children' => array('type' => ASN1::TYPE_INTEGER) |
|
| 1017 | + ) |
|
| 1018 | 1018 | ) |
| 1019 | 1019 | ); |
| 1020 | 1020 | |
@@ -1022,13 +1022,13 @@ discard block |
||
| 1022 | 1022 | 'type' => ASN1::TYPE_SEQUENCE, |
| 1023 | 1023 | 'children' => array( |
| 1024 | 1024 | 'noticeRef' => array( |
| 1025 | - 'optional' => true, |
|
| 1026 | - 'implicit' => true |
|
| 1027 | - ) + $NoticeReference, |
|
| 1025 | + 'optional' => true, |
|
| 1026 | + 'implicit' => true |
|
| 1027 | + ) + $NoticeReference, |
|
| 1028 | 1028 | 'explicitText' => array( |
| 1029 | - 'optional' => true, |
|
| 1030 | - 'implicit' => true |
|
| 1031 | - ) + $DisplayText |
|
| 1029 | + 'optional' => true, |
|
| 1030 | + 'implicit' => true |
|
| 1031 | + ) + $DisplayText |
|
| 1032 | 1032 | ) |
| 1033 | 1033 | ); |
| 1034 | 1034 | |
@@ -1057,11 +1057,11 @@ discard block |
||
| 1057 | 1057 | 'children' => array( |
| 1058 | 1058 | 'type' => $AttributeType, |
| 1059 | 1059 | 'value'=> array( |
| 1060 | - 'type' => ASN1::TYPE_SET, |
|
| 1061 | - 'min' => 1, |
|
| 1062 | - 'max' => -1, |
|
| 1063 | - 'children' => $this->AttributeValue |
|
| 1064 | - ) |
|
| 1060 | + 'type' => ASN1::TYPE_SET, |
|
| 1061 | + 'min' => 1, |
|
| 1062 | + 'max' => -1, |
|
| 1063 | + 'children' => $this->AttributeValue |
|
| 1064 | + ) |
|
| 1065 | 1065 | ) |
| 1066 | 1066 | ); |
| 1067 | 1067 | |
@@ -1078,16 +1078,16 @@ discard block |
||
| 1078 | 1078 | 'type' => ASN1::TYPE_SEQUENCE, |
| 1079 | 1079 | 'children' => array( |
| 1080 | 1080 | 'version' => array( |
| 1081 | - 'type' => ASN1::TYPE_INTEGER, |
|
| 1082 | - 'mapping' => array('v1') |
|
| 1083 | - ), |
|
| 1081 | + 'type' => ASN1::TYPE_INTEGER, |
|
| 1082 | + 'mapping' => array('v1') |
|
| 1083 | + ), |
|
| 1084 | 1084 | 'subject' => $this->Name, |
| 1085 | 1085 | 'subjectPKInfo' => $SubjectPublicKeyInfo, |
| 1086 | 1086 | 'attributes' => array( |
| 1087 | - 'constant' => 0, |
|
| 1088 | - 'optional' => true, |
|
| 1089 | - 'implicit' => true |
|
| 1090 | - ) + $Attributes, |
|
| 1087 | + 'constant' => 0, |
|
| 1088 | + 'optional' => true, |
|
| 1089 | + 'implicit' => true |
|
| 1090 | + ) + $Attributes, |
|
| 1091 | 1091 | ) |
| 1092 | 1092 | ); |
| 1093 | 1093 | |
@@ -1103,39 +1103,39 @@ discard block |
||
| 1103 | 1103 | $RevokedCertificate = array( |
| 1104 | 1104 | 'type' => ASN1::TYPE_SEQUENCE, |
| 1105 | 1105 | 'children' => array( |
| 1106 | - 'userCertificate' => $CertificateSerialNumber, |
|
| 1107 | - 'revocationDate' => $Time, |
|
| 1108 | - 'crlEntryExtensions' => array( |
|
| 1109 | - 'optional' => true |
|
| 1110 | - ) + $this->Extensions |
|
| 1111 | - ) |
|
| 1106 | + 'userCertificate' => $CertificateSerialNumber, |
|
| 1107 | + 'revocationDate' => $Time, |
|
| 1108 | + 'crlEntryExtensions' => array( |
|
| 1109 | + 'optional' => true |
|
| 1110 | + ) + $this->Extensions |
|
| 1111 | + ) |
|
| 1112 | 1112 | ); |
| 1113 | 1113 | |
| 1114 | 1114 | $TBSCertList = array( |
| 1115 | 1115 | 'type' => ASN1::TYPE_SEQUENCE, |
| 1116 | 1116 | 'children' => array( |
| 1117 | 1117 | 'version' => array( |
| 1118 | - 'optional' => true, |
|
| 1119 | - 'default' => 'v1' |
|
| 1120 | - ) + $Version, |
|
| 1118 | + 'optional' => true, |
|
| 1119 | + 'default' => 'v1' |
|
| 1120 | + ) + $Version, |
|
| 1121 | 1121 | 'signature' => $AlgorithmIdentifier, |
| 1122 | 1122 | 'issuer' => $this->Name, |
| 1123 | 1123 | 'thisUpdate' => $Time, |
| 1124 | 1124 | 'nextUpdate' => array( |
| 1125 | - 'optional' => true |
|
| 1126 | - ) + $Time, |
|
| 1125 | + 'optional' => true |
|
| 1126 | + ) + $Time, |
|
| 1127 | 1127 | 'revokedCertificates' => array( |
| 1128 | - 'type' => ASN1::TYPE_SEQUENCE, |
|
| 1129 | - 'optional' => true, |
|
| 1130 | - 'min' => 0, |
|
| 1131 | - 'max' => -1, |
|
| 1132 | - 'children' => $RevokedCertificate |
|
| 1133 | - ), |
|
| 1128 | + 'type' => ASN1::TYPE_SEQUENCE, |
|
| 1129 | + 'optional' => true, |
|
| 1130 | + 'min' => 0, |
|
| 1131 | + 'max' => -1, |
|
| 1132 | + 'children' => $RevokedCertificate |
|
| 1133 | + ), |
|
| 1134 | 1134 | 'crlExtensions' => array( |
| 1135 | - 'constant' => 0, |
|
| 1136 | - 'optional' => true, |
|
| 1137 | - 'explicit' => true |
|
| 1138 | - ) + $this->Extensions |
|
| 1135 | + 'constant' => 0, |
|
| 1136 | + 'optional' => true, |
|
| 1137 | + 'explicit' => true |
|
| 1138 | + ) + $this->Extensions |
|
| 1139 | 1139 | ) |
| 1140 | 1140 | ); |
| 1141 | 1141 | |
@@ -1151,7 +1151,7 @@ discard block |
||
| 1151 | 1151 | $this->CRLNumber = array('type' => ASN1::TYPE_INTEGER); |
| 1152 | 1152 | |
| 1153 | 1153 | $this->CRLReason = array('type' => ASN1::TYPE_ENUMERATED, |
| 1154 | - 'mapping' => array( |
|
| 1154 | + 'mapping' => array( |
|
| 1155 | 1155 | 'unspecified', |
| 1156 | 1156 | 'keyCompromise', |
| 1157 | 1157 | 'cACompromise', |
@@ -1206,7 +1206,7 @@ discard block |
||
| 1206 | 1206 | 'default' => false, |
| 1207 | 1207 | 'implicit' => true |
| 1208 | 1208 | ) |
| 1209 | - ) |
|
| 1209 | + ) |
|
| 1210 | 1210 | ); |
| 1211 | 1211 | |
| 1212 | 1212 | $this->InvalidityDate = array('type' => ASN1::TYPE_GENERALIZED_TIME); |
@@ -4353,7 +4353,7 @@ discard block |
||
| 4353 | 4353 | |
| 4354 | 4354 | $i = count($rclist); |
| 4355 | 4355 | $rclist[] = array('userCertificate' => $serial, |
| 4356 | - 'revocationDate' => $this->_timeField(@date('D, d M Y H:i:s O'))); |
|
| 4356 | + 'revocationDate' => $this->_timeField(@date('D, d M Y H:i:s O'))); |
|
| 4357 | 4357 | return $i; |
| 4358 | 4358 | } |
| 4359 | 4359 | |
