nilsteampassnet /
TeamPass
@@ -119,15 +119,15 @@ discard block |
||
| 119 | 119 | return false; |
| 120 | 120 | } |
| 121 | 121 | return "<RSAKeyValue>\r\n" . |
| 122 | - ' <Modulus>' . Base64::encode($n->toBytes()) . "</Modulus>\r\n" . |
|
| 123 | - ' <Exponent>' . Base64::encode($e->toBytes()) . "</Exponent>\r\n" . |
|
| 124 | - ' <P>' . Base64::encode($primes[1]->toBytes()) . "</P>\r\n" . |
|
| 125 | - ' <Q>' . Base64::encode($primes[2]->toBytes()) . "</Q>\r\n" . |
|
| 126 | - ' <DP>' . Base64::encode($exponents[1]->toBytes()) . "</DP>\r\n" . |
|
| 127 | - ' <DQ>' . Base64::encode($exponents[2]->toBytes()) . "</DQ>\r\n" . |
|
| 128 | - ' <InverseQ>' . Base64::encode($coefficients[2]->toBytes()) . "</InverseQ>\r\n" . |
|
| 129 | - ' <D>' . Base64::encode($d->toBytes()) . "</D>\r\n" . |
|
| 130 | - '</RSAKeyValue>'; |
|
| 122 | + ' <Modulus>' . Base64::encode($n->toBytes()) . "</Modulus>\r\n" . |
|
| 123 | + ' <Exponent>' . Base64::encode($e->toBytes()) . "</Exponent>\r\n" . |
|
| 124 | + ' <P>' . Base64::encode($primes[1]->toBytes()) . "</P>\r\n" . |
|
| 125 | + ' <Q>' . Base64::encode($primes[2]->toBytes()) . "</Q>\r\n" . |
|
| 126 | + ' <DP>' . Base64::encode($exponents[1]->toBytes()) . "</DP>\r\n" . |
|
| 127 | + ' <DQ>' . Base64::encode($exponents[2]->toBytes()) . "</DQ>\r\n" . |
|
| 128 | + ' <InverseQ>' . Base64::encode($coefficients[2]->toBytes()) . "</InverseQ>\r\n" . |
|
| 129 | + ' <D>' . Base64::encode($d->toBytes()) . "</D>\r\n" . |
|
| 130 | + '</RSAKeyValue>'; |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | /** |
@@ -141,8 +141,8 @@ discard block |
||
| 141 | 141 | static function savePublicKey(BigInteger $n, BigInteger $e) |
| 142 | 142 | { |
| 143 | 143 | return "<RSAKeyValue>\r\n" . |
| 144 | - ' <Modulus>' . Base64::encode($n->toBytes()) . "</Modulus>\r\n" . |
|
| 145 | - ' <Exponent>' . Base64::encode($e->toBytes()) . "</Exponent>\r\n" . |
|
| 146 | - '</RSAKeyValue>'; |
|
| 144 | + ' <Modulus>' . Base64::encode($n->toBytes()) . "</Modulus>\r\n" . |
|
| 145 | + ' <Exponent>' . Base64::encode($e->toBytes()) . "</Exponent>\r\n" . |
|
| 146 | + '</RSAKeyValue>'; |
|
| 147 | 147 | } |
| 148 | 148 | } |
@@ -150,12 +150,12 @@ |
||
| 150 | 150 | $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, ASN1::encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey); |
| 151 | 151 | |
| 152 | 152 | $RSAPrivateKey = "-----BEGIN ENCRYPTED PRIVATE KEY-----\r\n" . |
| 153 | - chunk_split(Base64::encode($RSAPrivateKey), 64) . |
|
| 154 | - '-----END ENCRYPTED PRIVATE KEY-----'; |
|
| 153 | + chunk_split(Base64::encode($RSAPrivateKey), 64) . |
|
| 154 | + '-----END ENCRYPTED PRIVATE KEY-----'; |
|
| 155 | 155 | } else { |
| 156 | 156 | $RSAPrivateKey = "-----BEGIN PRIVATE KEY-----\r\n" . |
| 157 | - chunk_split(Base64::encode($RSAPrivateKey), 64) . |
|
| 158 | - '-----END PRIVATE KEY-----'; |
|
| 157 | + chunk_split(Base64::encode($RSAPrivateKey), 64) . |
|
| 158 | + '-----END PRIVATE KEY-----'; |
|
| 159 | 159 | } |
| 160 | 160 | |
| 161 | 161 | return $RSAPrivateKey; |
@@ -289,9 +289,9 @@ |
||
| 289 | 289 | $n |
| 290 | 290 | ); |
| 291 | 291 | $key = "---- BEGIN SSH2 PUBLIC KEY ----\r\n" . |
| 292 | - 'Comment: "' . str_replace(array('\\', '"'), array('\\\\', '\"'), self::$comment) . "\"\r\n"; |
|
| 293 | - chunk_split(Base64::encode($key), 64) . |
|
| 294 | - '---- END SSH2 PUBLIC KEY ----'; |
|
| 292 | + 'Comment: "' . str_replace(array('\\', '"'), array('\\\\', '\"'), self::$comment) . "\"\r\n"; |
|
| 293 | + chunk_split(Base64::encode($key), 64) . |
|
| 294 | + '---- END SSH2 PUBLIC KEY ----'; |
|
| 295 | 295 | |
| 296 | 296 | return $key; |
| 297 | 297 | } |
@@ -693,9 +693,9 @@ |
||
| 693 | 693 | // Creates the inline-crypt function |
| 694 | 694 | $lambda_functions[$code_hash] = $this->_createInlineCryptFunction( |
| 695 | 695 | array( |
| 696 | - 'init_crypt' => $init_crypt, |
|
| 697 | - 'encrypt_block' => $encrypt_block, |
|
| 698 | - 'decrypt_block' => $decrypt_block |
|
| 696 | + 'init_crypt' => $init_crypt, |
|
| 697 | + 'encrypt_block' => $encrypt_block, |
|
| 698 | + 'decrypt_block' => $decrypt_block |
|
| 699 | 699 | ) |
| 700 | 700 | ); |
| 701 | 701 | } |
@@ -96,12 +96,12 @@ |
||
| 96 | 96 | session_start(); |
| 97 | 97 | |
| 98 | 98 | $v = (isset($_SERVER) ? self::safe_serialize($_SERVER) : '') . |
| 99 | - (isset($_POST) ? self::safe_serialize($_POST) : '') . |
|
| 100 | - (isset($_GET) ? self::safe_serialize($_GET) : '') . |
|
| 101 | - (isset($_COOKIE) ? self::safe_serialize($_COOKIE) : '') . |
|
| 102 | - self::safe_serialize($GLOBALS) . |
|
| 103 | - self::safe_serialize($_SESSION) . |
|
| 104 | - self::safe_serialize($_OLD_SESSION); |
|
| 99 | + (isset($_POST) ? self::safe_serialize($_POST) : '') . |
|
| 100 | + (isset($_GET) ? self::safe_serialize($_GET) : '') . |
|
| 101 | + (isset($_COOKIE) ? self::safe_serialize($_COOKIE) : '') . |
|
| 102 | + self::safe_serialize($GLOBALS) . |
|
| 103 | + self::safe_serialize($_SESSION) . |
|
| 104 | + self::safe_serialize($_OLD_SESSION); |
|
| 105 | 105 | $v = $seed = $_SESSION['seed'] = sha1($v, true); |
| 106 | 106 | if (!isset($_SESSION['count'])) { |
| 107 | 107 | $_SESSION['count'] = 0; |
@@ -372,9 +372,9 @@ discard block |
||
| 372 | 372 | // subWord |
| 373 | 373 | for ($i = 0; $i < $Nb; ++$i) { |
| 374 | 374 | $state[$i] = $sbox[$state[$i] & 0x000000FF] | |
| 375 | - ($sbox[$state[$i] >> 8 & 0x000000FF] << 8) | |
|
| 376 | - ($sbox[$state[$i] >> 16 & 0x000000FF] << 16) | |
|
| 377 | - ($sbox[$state[$i] >> 24 & 0x000000FF] << 24); |
|
| 375 | + ($sbox[$state[$i] >> 8 & 0x000000FF] << 8) | |
|
| 376 | + ($sbox[$state[$i] >> 16 & 0x000000FF] << 16) | |
|
| 377 | + ($sbox[$state[$i] >> 24 & 0x000000FF] << 24); |
|
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | // shiftRows + addRoundKey |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | ($state[$j] & 0x00FF0000) ^ |
| 388 | 388 | ($state[$k] & 0x0000FF00) ^ |
| 389 | 389 | ($state[$l] & 0x000000FF) ^ |
| 390 | - $w[$i]; |
|
| 390 | + $w[$i]; |
|
| 391 | 391 | ++$i; |
| 392 | 392 | $j = ($j + 1) % $Nb; |
| 393 | 393 | $k = ($k + 1) % $Nb; |
@@ -475,9 +475,9 @@ discard block |
||
| 475 | 475 | ($state[$l] & 0x000000FF); |
| 476 | 476 | |
| 477 | 477 | $temp[$i] = $dw[$i] ^ ($isbox[$word & 0x000000FF] | |
| 478 | - ($isbox[$word >> 8 & 0x000000FF] << 8) | |
|
| 479 | - ($isbox[$word >> 16 & 0x000000FF] << 16) | |
|
| 480 | - ($isbox[$word >> 24 & 0x000000FF] << 24)); |
|
| 478 | + ($isbox[$word >> 8 & 0x000000FF] << 8) | |
|
| 479 | + ($isbox[$word >> 16 & 0x000000FF] << 16) | |
|
| 480 | + ($isbox[$word >> 24 & 0x000000FF] << 24)); |
|
| 481 | 481 | ++$i; |
| 482 | 482 | $j = ($j + 1) % $Nb; |
| 483 | 483 | $k = ($k + 1) % $Nb; |
@@ -625,9 +625,9 @@ discard block |
||
| 625 | 625 | } |
| 626 | 626 | |
| 627 | 627 | return $sbox[$word & 0x000000FF] | |
| 628 | - ($sbox[$word >> 8 & 0x000000FF] << 8) | |
|
| 629 | - ($sbox[$word >> 16 & 0x000000FF] << 16) | |
|
| 630 | - ($sbox[$word >> 24 & 0x000000FF] << 24); |
|
| 628 | + ($sbox[$word >> 8 & 0x000000FF] << 8) | |
|
| 629 | + ($sbox[$word >> 16 & 0x000000FF] << 16) | |
|
| 630 | + ($sbox[$word >> 24 & 0x000000FF] << 24); |
|
| 631 | 631 | } |
| 632 | 632 | |
| 633 | 633 | /** |
@@ -966,11 +966,11 @@ discard block |
||
| 966 | 966 | |
| 967 | 967 | $lambda_functions[$code_hash] = $this->_createInlineCryptFunction( |
| 968 | 968 | array( |
| 969 | - 'init_crypt' => '', |
|
| 970 | - 'init_encrypt' => $init_encrypt, |
|
| 971 | - 'init_decrypt' => $init_decrypt, |
|
| 972 | - 'encrypt_block' => $encrypt_block, |
|
| 973 | - 'decrypt_block' => $decrypt_block |
|
| 969 | + 'init_crypt' => '', |
|
| 970 | + 'init_encrypt' => $init_encrypt, |
|
| 971 | + 'init_decrypt' => $init_decrypt, |
|
| 972 | + 'encrypt_block' => $encrypt_block, |
|
| 973 | + 'decrypt_block' => $decrypt_block |
|
| 974 | 974 | ) |
| 975 | 975 | ); |
| 976 | 976 | } |
@@ -979,16 +979,16 @@ discard block |
||
| 979 | 979 | array(60 => 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ'), |
| 980 | 980 | array(60 => 'NET_SSH2_MSG_USERAUTH_PK_OK'), |
| 981 | 981 | array(60 => 'NET_SSH2_MSG_USERAUTH_INFO_REQUEST', |
| 982 | - 61 => 'NET_SSH2_MSG_USERAUTH_INFO_RESPONSE'), |
|
| 982 | + 61 => 'NET_SSH2_MSG_USERAUTH_INFO_RESPONSE'), |
|
| 983 | 983 | // RFC 4419 - diffie-hellman-group-exchange-sha{1,256} |
| 984 | 984 | array(30 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST_OLD', |
| 985 | - 31 => 'NET_SSH2_MSG_KEXDH_GEX_GROUP', |
|
| 986 | - 32 => 'NET_SSH2_MSG_KEXDH_GEX_INIT', |
|
| 987 | - 33 => 'NET_SSH2_MSG_KEXDH_GEX_REPLY', |
|
| 988 | - 34 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST'), |
|
| 985 | + 31 => 'NET_SSH2_MSG_KEXDH_GEX_GROUP', |
|
| 986 | + 32 => 'NET_SSH2_MSG_KEXDH_GEX_INIT', |
|
| 987 | + 33 => 'NET_SSH2_MSG_KEXDH_GEX_REPLY', |
|
| 988 | + 34 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST'), |
|
| 989 | 989 | // RFC 5656 - Elliptic Curves (for [email protected]) |
| 990 | 990 | array(30 => 'NET_SSH2_MSG_KEX_ECDH_INIT', |
| 991 | - 31 => 'NET_SSH2_MSG_KEX_ECDH_REPLY') |
|
| 991 | + 31 => 'NET_SSH2_MSG_KEX_ECDH_REPLY') |
|
| 992 | 992 | ); |
| 993 | 993 | |
| 994 | 994 | self::$connections[$this->getResourceId()] = $this; |
@@ -1248,7 +1248,7 @@ discard block |
||
| 1248 | 1248 | 'twofish192-cbc', // OPTIONAL Twofish with a 192-bit key |
| 1249 | 1249 | 'twofish256-cbc', |
| 1250 | 1250 | 'twofish-cbc', // OPTIONAL alias for "twofish256-cbc" |
| 1251 | - // (this is being retained for historical reasons) |
|
| 1251 | + // (this is being retained for historical reasons) |
|
| 1252 | 1252 | |
| 1253 | 1253 | 'blowfish-ctr', // OPTIONAL Blowfish in SDCTR mode |
| 1254 | 1254 | |
@@ -3002,7 +3002,7 @@ discard block |
||
| 3002 | 3002 | $current = microtime(true); |
| 3003 | 3003 | $message_number = isset($this->message_numbers[ord($payload[0])]) ? $this->message_numbers[ord($payload[0])] : 'UNKNOWN (' . ord($payload[0]) . ')'; |
| 3004 | 3004 | $message_number = '<- ' . $message_number . |
| 3005 | - ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)'; |
|
| 3005 | + ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)'; |
|
| 3006 | 3006 | $this->_append_log($message_number, $payload); |
| 3007 | 3007 | $this->last_packet = $current; |
| 3008 | 3008 | } |
@@ -3477,7 +3477,7 @@ discard block |
||
| 3477 | 3477 | $current = microtime(true); |
| 3478 | 3478 | $message_number = isset($this->message_numbers[ord($data[0])]) ? $this->message_numbers[ord($data[0])] : 'UNKNOWN (' . ord($data[0]) . ')'; |
| 3479 | 3479 | $message_number = '-> ' . $message_number . |
| 3480 | - ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)'; |
|
| 3480 | + ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)'; |
|
| 3481 | 3481 | $this->_append_log($message_number, isset($logged) ? $logged : $data); |
| 3482 | 3482 | $this->last_packet = $current; |
| 3483 | 3483 | } |
@@ -439,8 +439,8 @@ discard block |
||
| 439 | 439 | if ($response === false) { |
| 440 | 440 | // from PuTTY's psftp.exe |
| 441 | 441 | $command = "test -x /usr/lib/sftp-server && exec /usr/lib/sftp-server\n" . |
| 442 | - "test -x /usr/local/lib/sftp-server && exec /usr/local/lib/sftp-server\n" . |
|
| 443 | - "exec sftp-server"; |
|
| 442 | + "test -x /usr/local/lib/sftp-server && exec /usr/local/lib/sftp-server\n" . |
|
| 443 | + "exec sftp-server"; |
|
| 444 | 444 | // 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 |
| 445 | 445 | // is redundant |
| 446 | 446 | $packet = pack( |
@@ -2795,7 +2795,7 @@ discard block |
||
| 2795 | 2795 | |
| 2796 | 2796 | if (defined('NET_SFTP_LOGGING')) { |
| 2797 | 2797 | $packet_type = '-> ' . $this->packet_types[$type] . |
| 2798 | - ' (' . round($stop - $start, 4) . 's)'; |
|
| 2798 | + ' (' . round($stop - $start, 4) . 's)'; |
|
| 2799 | 2799 | if (NET_SFTP_LOGGING == self::LOG_REALTIME) { |
| 2800 | 2800 | echo "<pre>\r\n" . $this->_format_log(array($data), array($packet_type)) . "\r\n</pre>\r\n"; |
| 2801 | 2801 | flush(); |
@@ -2871,7 +2871,7 @@ discard block |
||
| 2871 | 2871 | |
| 2872 | 2872 | if (defined('NET_SFTP_LOGGING')) { |
| 2873 | 2873 | $packet_type = '<- ' . $this->packet_types[$this->packet_type] . |
| 2874 | - ' (' . round($stop - $start, 4) . 's)'; |
|
| 2874 | + ' (' . round($stop - $start, 4) . 's)'; |
|
| 2875 | 2875 | if (NET_SFTP_LOGGING == self::LOG_REALTIME) { |
| 2876 | 2876 | echo "<pre>\r\n" . $this->_format_log(array($packet), array($packet_type)) . "\r\n</pre>\r\n"; |
| 2877 | 2877 | flush(); |
@@ -402,10 +402,10 @@ discard block |
||
| 402 | 402 | 'children' => array( |
| 403 | 403 | 'extnId' => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER), |
| 404 | 404 | 'critical' => array( |
| 405 | - 'type' => ASN1::TYPE_BOOLEAN, |
|
| 406 | - 'optional' => true, |
|
| 407 | - 'default' => false |
|
| 408 | - ), |
|
| 405 | + 'type' => ASN1::TYPE_BOOLEAN, |
|
| 406 | + 'optional' => true, |
|
| 407 | + 'default' => false |
|
| 408 | + ), |
|
| 409 | 409 | 'extnValue' => array('type' => ASN1::TYPE_OCTET_STRING) |
| 410 | 410 | ) |
| 411 | 411 | ); |
@@ -460,11 +460,11 @@ discard block |
||
| 460 | 460 | // technically, default implies optional, but we'll define it as being optional, none-the-less, just to |
| 461 | 461 | // reenforce that fact |
| 462 | 462 | 'version' => array( |
| 463 | - 'constant' => 0, |
|
| 464 | - 'optional' => true, |
|
| 465 | - 'explicit' => true, |
|
| 466 | - 'default' => 'v1' |
|
| 467 | - ) + $Version, |
|
| 463 | + 'constant' => 0, |
|
| 464 | + 'optional' => true, |
|
| 465 | + 'explicit' => true, |
|
| 466 | + 'default' => 'v1' |
|
| 467 | + ) + $Version, |
|
| 468 | 468 | 'serialNumber' => $CertificateSerialNumber, |
| 469 | 469 | 'signature' => $AlgorithmIdentifier, |
| 470 | 470 | 'issuer' => $this->Name, |
@@ -473,31 +473,31 @@ discard block |
||
| 473 | 473 | 'subjectPublicKeyInfo' => $SubjectPublicKeyInfo, |
| 474 | 474 | // implicit means that the T in the TLV structure is to be rewritten, regardless of the type |
| 475 | 475 | 'issuerUniqueID' => array( |
| 476 | - 'constant' => 1, |
|
| 477 | - 'optional' => true, |
|
| 478 | - 'implicit' => true |
|
| 479 | - ) + $UniqueIdentifier, |
|
| 476 | + 'constant' => 1, |
|
| 477 | + 'optional' => true, |
|
| 478 | + 'implicit' => true |
|
| 479 | + ) + $UniqueIdentifier, |
|
| 480 | 480 | 'subjectUniqueID' => array( |
| 481 | - 'constant' => 2, |
|
| 482 | - 'optional' => true, |
|
| 483 | - 'implicit' => true |
|
| 484 | - ) + $UniqueIdentifier, |
|
| 481 | + 'constant' => 2, |
|
| 482 | + 'optional' => true, |
|
| 483 | + 'implicit' => true |
|
| 484 | + ) + $UniqueIdentifier, |
|
| 485 | 485 | // <http://tools.ietf.org/html/rfc2459#page-74> doesn't use the EXPLICIT keyword but if |
| 486 | 486 | // it's not IMPLICIT, it's EXPLICIT |
| 487 | 487 | 'extensions' => array( |
| 488 | - 'constant' => 3, |
|
| 489 | - 'optional' => true, |
|
| 490 | - 'explicit' => true |
|
| 491 | - ) + $this->Extensions |
|
| 488 | + 'constant' => 3, |
|
| 489 | + 'optional' => true, |
|
| 490 | + 'explicit' => true |
|
| 491 | + ) + $this->Extensions |
|
| 492 | 492 | ) |
| 493 | 493 | ); |
| 494 | 494 | |
| 495 | 495 | $this->Certificate = array( |
| 496 | 496 | 'type' => ASN1::TYPE_SEQUENCE, |
| 497 | 497 | 'children' => array( |
| 498 | - 'tbsCertificate' => $TBSCertificate, |
|
| 499 | - 'signatureAlgorithm' => $AlgorithmIdentifier, |
|
| 500 | - 'signature' => array('type' => ASN1::TYPE_BIT_STRING) |
|
| 498 | + 'tbsCertificate' => $TBSCertificate, |
|
| 499 | + 'signatureAlgorithm' => $AlgorithmIdentifier, |
|
| 500 | + 'signature' => array('type' => ASN1::TYPE_BIT_STRING) |
|
| 501 | 501 | ) |
| 502 | 502 | ); |
| 503 | 503 | |
@@ -520,14 +520,14 @@ discard block |
||
| 520 | 520 | 'type' => ASN1::TYPE_SEQUENCE, |
| 521 | 521 | 'children' => array( |
| 522 | 522 | 'cA' => array( |
| 523 | - 'type' => ASN1::TYPE_BOOLEAN, |
|
| 524 | - 'optional' => true, |
|
| 525 | - 'default' => false |
|
| 526 | - ), |
|
| 523 | + 'type' => ASN1::TYPE_BOOLEAN, |
|
| 524 | + 'optional' => true, |
|
| 525 | + 'default' => false |
|
| 526 | + ), |
|
| 527 | 527 | 'pathLenConstraint' => array( |
| 528 | - 'type' => ASN1::TYPE_INTEGER, |
|
| 529 | - 'optional' => true |
|
| 530 | - ) |
|
| 528 | + 'type' => ASN1::TYPE_INTEGER, |
|
| 529 | + 'optional' => true |
|
| 530 | + ) |
|
| 531 | 531 | ) |
| 532 | 532 | ); |
| 533 | 533 | |
@@ -544,29 +544,29 @@ discard block |
||
| 544 | 544 | 'type' => ASN1::TYPE_SET, |
| 545 | 545 | 'children' => array( |
| 546 | 546 | 'surname' => array( |
| 547 | - 'type' => ASN1::TYPE_PRINTABLE_STRING, |
|
| 548 | - 'constant' => 0, |
|
| 549 | - 'optional' => true, |
|
| 550 | - 'implicit' => true |
|
| 551 | - ), |
|
| 547 | + 'type' => ASN1::TYPE_PRINTABLE_STRING, |
|
| 548 | + 'constant' => 0, |
|
| 549 | + 'optional' => true, |
|
| 550 | + 'implicit' => true |
|
| 551 | + ), |
|
| 552 | 552 | 'given-name' => array( |
| 553 | - 'type' => ASN1::TYPE_PRINTABLE_STRING, |
|
| 554 | - 'constant' => 1, |
|
| 555 | - 'optional' => true, |
|
| 556 | - 'implicit' => true |
|
| 557 | - ), |
|
| 553 | + 'type' => ASN1::TYPE_PRINTABLE_STRING, |
|
| 554 | + 'constant' => 1, |
|
| 555 | + 'optional' => true, |
|
| 556 | + 'implicit' => true |
|
| 557 | + ), |
|
| 558 | 558 | 'initials' => array( |
| 559 | - 'type' => ASN1::TYPE_PRINTABLE_STRING, |
|
| 560 | - 'constant' => 2, |
|
| 561 | - 'optional' => true, |
|
| 562 | - 'implicit' => true |
|
| 563 | - ), |
|
| 559 | + 'type' => ASN1::TYPE_PRINTABLE_STRING, |
|
| 560 | + 'constant' => 2, |
|
| 561 | + 'optional' => true, |
|
| 562 | + 'implicit' => true |
|
| 563 | + ), |
|
| 564 | 564 | 'generation-qualifier' => array( |
| 565 | - 'type' => ASN1::TYPE_PRINTABLE_STRING, |
|
| 566 | - 'constant' => 3, |
|
| 567 | - 'optional' => true, |
|
| 568 | - 'implicit' => true |
|
| 569 | - ) |
|
| 565 | + 'type' => ASN1::TYPE_PRINTABLE_STRING, |
|
| 566 | + 'constant' => 3, |
|
| 567 | + 'optional' => true, |
|
| 568 | + 'implicit' => true |
|
| 569 | + ) |
|
| 570 | 570 | ) |
| 571 | 571 | ); |
| 572 | 572 | |
@@ -613,26 +613,26 @@ discard block |
||
| 613 | 613 | $AnotherName = array( |
| 614 | 614 | 'type' => ASN1::TYPE_SEQUENCE, |
| 615 | 615 | 'children' => array( |
| 616 | - 'type-id' => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER), |
|
| 617 | - 'value' => array( |
|
| 618 | - 'type' => ASN1::TYPE_ANY, |
|
| 619 | - 'constant' => 0, |
|
| 620 | - 'optional' => true, |
|
| 621 | - 'explicit' => true |
|
| 622 | - ) |
|
| 616 | + 'type-id' => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER), |
|
| 617 | + 'value' => array( |
|
| 618 | + 'type' => ASN1::TYPE_ANY, |
|
| 619 | + 'constant' => 0, |
|
| 620 | + 'optional' => true, |
|
| 621 | + 'explicit' => true |
|
| 622 | + ) |
|
| 623 | 623 | ) |
| 624 | 624 | ); |
| 625 | 625 | |
| 626 | 626 | $ExtensionAttribute = array( |
| 627 | 627 | 'type' => ASN1::TYPE_SEQUENCE, |
| 628 | 628 | 'children' => array( |
| 629 | - 'extension-attribute-type' => array( |
|
| 629 | + 'extension-attribute-type' => array( |
|
| 630 | 630 | 'type' => ASN1::TYPE_PRINTABLE_STRING, |
| 631 | 631 | 'constant' => 0, |
| 632 | 632 | 'optional' => true, |
| 633 | 633 | 'implicit' => true |
| 634 | 634 | ), |
| 635 | - 'extension-attribute-value' => array( |
|
| 635 | + 'extension-attribute-value' => array( |
|
| 636 | 636 | 'type' => ASN1::TYPE_ANY, |
| 637 | 637 | 'constant' => 1, |
| 638 | 638 | 'optional' => true, |
@@ -651,8 +651,8 @@ discard block |
||
| 651 | 651 | $BuiltInDomainDefinedAttribute = array( |
| 652 | 652 | 'type' => ASN1::TYPE_SEQUENCE, |
| 653 | 653 | 'children' => array( |
| 654 | - 'type' => array('type' => ASN1::TYPE_PRINTABLE_STRING), |
|
| 655 | - 'value' => array('type' => ASN1::TYPE_PRINTABLE_STRING) |
|
| 654 | + 'type' => array('type' => ASN1::TYPE_PRINTABLE_STRING), |
|
| 655 | + 'value' => array('type' => ASN1::TYPE_PRINTABLE_STRING) |
|
| 656 | 656 | ) |
| 657 | 657 | ); |
| 658 | 658 | |
@@ -669,63 +669,63 @@ discard block |
||
| 669 | 669 | 'country-name' => array('optional' => true) + $CountryName, |
| 670 | 670 | 'administration-domain-name' => array('optional' => true) + $AdministrationDomainName, |
| 671 | 671 | 'network-address' => array( |
| 672 | - 'constant' => 0, |
|
| 673 | - 'optional' => true, |
|
| 674 | - 'implicit' => true |
|
| 675 | - ) + $NetworkAddress, |
|
| 672 | + 'constant' => 0, |
|
| 673 | + 'optional' => true, |
|
| 674 | + 'implicit' => true |
|
| 675 | + ) + $NetworkAddress, |
|
| 676 | 676 | 'terminal-identifier' => array( |
| 677 | - 'constant' => 1, |
|
| 678 | - 'optional' => true, |
|
| 679 | - 'implicit' => true |
|
| 680 | - ) + $TerminalIdentifier, |
|
| 677 | + 'constant' => 1, |
|
| 678 | + 'optional' => true, |
|
| 679 | + 'implicit' => true |
|
| 680 | + ) + $TerminalIdentifier, |
|
| 681 | 681 | 'private-domain-name' => array( |
| 682 | - 'constant' => 2, |
|
| 683 | - 'optional' => true, |
|
| 684 | - 'explicit' => true |
|
| 685 | - ) + $PrivateDomainName, |
|
| 682 | + 'constant' => 2, |
|
| 683 | + 'optional' => true, |
|
| 684 | + 'explicit' => true |
|
| 685 | + ) + $PrivateDomainName, |
|
| 686 | 686 | 'organization-name' => array( |
| 687 | - 'constant' => 3, |
|
| 688 | - 'optional' => true, |
|
| 689 | - 'implicit' => true |
|
| 690 | - ) + $OrganizationName, |
|
| 687 | + 'constant' => 3, |
|
| 688 | + 'optional' => true, |
|
| 689 | + 'implicit' => true |
|
| 690 | + ) + $OrganizationName, |
|
| 691 | 691 | 'numeric-user-identifier' => array( |
| 692 | - 'constant' => 4, |
|
| 693 | - 'optional' => true, |
|
| 694 | - 'implicit' => true |
|
| 695 | - ) + $NumericUserIdentifier, |
|
| 692 | + 'constant' => 4, |
|
| 693 | + 'optional' => true, |
|
| 694 | + 'implicit' => true |
|
| 695 | + ) + $NumericUserIdentifier, |
|
| 696 | 696 | 'personal-name' => array( |
| 697 | - 'constant' => 5, |
|
| 698 | - 'optional' => true, |
|
| 699 | - 'implicit' => true |
|
| 700 | - ) + $PersonalName, |
|
| 697 | + 'constant' => 5, |
|
| 698 | + 'optional' => true, |
|
| 699 | + 'implicit' => true |
|
| 700 | + ) + $PersonalName, |
|
| 701 | 701 | 'organizational-unit-names' => array( |
| 702 | - 'constant' => 6, |
|
| 703 | - 'optional' => true, |
|
| 704 | - 'implicit' => true |
|
| 705 | - ) + $OrganizationalUnitNames |
|
| 702 | + 'constant' => 6, |
|
| 703 | + 'optional' => true, |
|
| 704 | + 'implicit' => true |
|
| 705 | + ) + $OrganizationalUnitNames |
|
| 706 | 706 | ) |
| 707 | 707 | ); |
| 708 | 708 | |
| 709 | 709 | $ORAddress = array( |
| 710 | 710 | 'type' => ASN1::TYPE_SEQUENCE, |
| 711 | 711 | 'children' => array( |
| 712 | - 'built-in-standard-attributes' => $BuiltInStandardAttributes, |
|
| 713 | - 'built-in-domain-defined-attributes' => array('optional' => true) + $BuiltInDomainDefinedAttributes, |
|
| 714 | - 'extension-attributes' => array('optional' => true) + $ExtensionAttributes |
|
| 712 | + 'built-in-standard-attributes' => $BuiltInStandardAttributes, |
|
| 713 | + 'built-in-domain-defined-attributes' => array('optional' => true) + $BuiltInDomainDefinedAttributes, |
|
| 714 | + 'extension-attributes' => array('optional' => true) + $ExtensionAttributes |
|
| 715 | 715 | ) |
| 716 | 716 | ); |
| 717 | 717 | |
| 718 | 718 | $EDIPartyName = array( |
| 719 | 719 | 'type' => ASN1::TYPE_SEQUENCE, |
| 720 | 720 | 'children' => array( |
| 721 | - 'nameAssigner' => array( |
|
| 721 | + 'nameAssigner' => array( |
|
| 722 | 722 | 'constant' => 0, |
| 723 | 723 | 'optional' => true, |
| 724 | 724 | 'implicit' => true |
| 725 | 725 | ) + $this->DirectoryString, |
| 726 | - // partyName is technically required but \phpseclib\File\ASN1 doesn't currently support non-optional constants and |
|
| 727 | - // setting it to optional gets the job done in any event. |
|
| 728 | - 'partyName' => array( |
|
| 726 | + // partyName is technically required but \phpseclib\File\ASN1 doesn't currently support non-optional constants and |
|
| 727 | + // setting it to optional gets the job done in any event. |
|
| 728 | + 'partyName' => array( |
|
| 729 | 729 | 'constant' => 1, |
| 730 | 730 | 'optional' => true, |
| 731 | 731 | 'implicit' => true |
@@ -737,55 +737,55 @@ discard block |
||
| 737 | 737 | 'type' => ASN1::TYPE_CHOICE, |
| 738 | 738 | 'children' => array( |
| 739 | 739 | 'otherName' => array( |
| 740 | - 'constant' => 0, |
|
| 741 | - 'optional' => true, |
|
| 742 | - 'implicit' => true |
|
| 743 | - ) + $AnotherName, |
|
| 740 | + 'constant' => 0, |
|
| 741 | + 'optional' => true, |
|
| 742 | + 'implicit' => true |
|
| 743 | + ) + $AnotherName, |
|
| 744 | 744 | 'rfc822Name' => array( |
| 745 | - 'type' => ASN1::TYPE_IA5_STRING, |
|
| 746 | - 'constant' => 1, |
|
| 747 | - 'optional' => true, |
|
| 748 | - 'implicit' => true |
|
| 749 | - ), |
|
| 745 | + 'type' => ASN1::TYPE_IA5_STRING, |
|
| 746 | + 'constant' => 1, |
|
| 747 | + 'optional' => true, |
|
| 748 | + 'implicit' => true |
|
| 749 | + ), |
|
| 750 | 750 | 'dNSName' => array( |
| 751 | - 'type' => ASN1::TYPE_IA5_STRING, |
|
| 752 | - 'constant' => 2, |
|
| 753 | - 'optional' => true, |
|
| 754 | - 'implicit' => true |
|
| 755 | - ), |
|
| 751 | + 'type' => ASN1::TYPE_IA5_STRING, |
|
| 752 | + 'constant' => 2, |
|
| 753 | + 'optional' => true, |
|
| 754 | + 'implicit' => true |
|
| 755 | + ), |
|
| 756 | 756 | 'x400Address' => array( |
| 757 | - 'constant' => 3, |
|
| 758 | - 'optional' => true, |
|
| 759 | - 'implicit' => true |
|
| 760 | - ) + $ORAddress, |
|
| 757 | + 'constant' => 3, |
|
| 758 | + 'optional' => true, |
|
| 759 | + 'implicit' => true |
|
| 760 | + ) + $ORAddress, |
|
| 761 | 761 | 'directoryName' => array( |
| 762 | - 'constant' => 4, |
|
| 763 | - 'optional' => true, |
|
| 764 | - 'explicit' => true |
|
| 765 | - ) + $this->Name, |
|
| 762 | + 'constant' => 4, |
|
| 763 | + 'optional' => true, |
|
| 764 | + 'explicit' => true |
|
| 765 | + ) + $this->Name, |
|
| 766 | 766 | 'ediPartyName' => array( |
| 767 | - 'constant' => 5, |
|
| 768 | - 'optional' => true, |
|
| 769 | - 'implicit' => true |
|
| 770 | - ) + $EDIPartyName, |
|
| 767 | + 'constant' => 5, |
|
| 768 | + 'optional' => true, |
|
| 769 | + 'implicit' => true |
|
| 770 | + ) + $EDIPartyName, |
|
| 771 | 771 | 'uniformResourceIdentifier' => array( |
| 772 | - 'type' => ASN1::TYPE_IA5_STRING, |
|
| 773 | - 'constant' => 6, |
|
| 774 | - 'optional' => true, |
|
| 775 | - 'implicit' => true |
|
| 776 | - ), |
|
| 772 | + 'type' => ASN1::TYPE_IA5_STRING, |
|
| 773 | + 'constant' => 6, |
|
| 774 | + 'optional' => true, |
|
| 775 | + 'implicit' => true |
|
| 776 | + ), |
|
| 777 | 777 | 'iPAddress' => array( |
| 778 | - 'type' => ASN1::TYPE_OCTET_STRING, |
|
| 779 | - 'constant' => 7, |
|
| 780 | - 'optional' => true, |
|
| 781 | - 'implicit' => true |
|
| 782 | - ), |
|
| 778 | + 'type' => ASN1::TYPE_OCTET_STRING, |
|
| 779 | + 'constant' => 7, |
|
| 780 | + 'optional' => true, |
|
| 781 | + 'implicit' => true |
|
| 782 | + ), |
|
| 783 | 783 | 'registeredID' => array( |
| 784 | - 'type' => ASN1::TYPE_OBJECT_IDENTIFIER, |
|
| 785 | - 'constant' => 8, |
|
| 786 | - 'optional' => true, |
|
| 787 | - 'implicit' => true |
|
| 788 | - ) |
|
| 784 | + 'type' => ASN1::TYPE_OBJECT_IDENTIFIER, |
|
| 785 | + 'constant' => 8, |
|
| 786 | + 'optional' => true, |
|
| 787 | + 'implicit' => true |
|
| 788 | + ) |
|
| 789 | 789 | ) |
| 790 | 790 | ); |
| 791 | 791 | |
@@ -817,15 +817,15 @@ discard block |
||
| 817 | 817 | 'type' => ASN1::TYPE_CHOICE, |
| 818 | 818 | 'children' => array( |
| 819 | 819 | 'fullName' => array( |
| 820 | - 'constant' => 0, |
|
| 821 | - 'optional' => true, |
|
| 822 | - 'implicit' => true |
|
| 823 | - ) + $GeneralNames, |
|
| 820 | + 'constant' => 0, |
|
| 821 | + 'optional' => true, |
|
| 822 | + 'implicit' => true |
|
| 823 | + ) + $GeneralNames, |
|
| 824 | 824 | 'nameRelativeToCRLIssuer' => array( |
| 825 | - 'constant' => 1, |
|
| 826 | - 'optional' => true, |
|
| 827 | - 'implicit' => true |
|
| 828 | - ) + $this->RelativeDistinguishedName |
|
| 825 | + 'constant' => 1, |
|
| 826 | + 'optional' => true, |
|
| 827 | + 'implicit' => true |
|
| 828 | + ) + $this->RelativeDistinguishedName |
|
| 829 | 829 | ) |
| 830 | 830 | ); |
| 831 | 831 | |
@@ -833,20 +833,20 @@ discard block |
||
| 833 | 833 | 'type' => ASN1::TYPE_SEQUENCE, |
| 834 | 834 | 'children' => array( |
| 835 | 835 | 'distributionPoint' => array( |
| 836 | - 'constant' => 0, |
|
| 837 | - 'optional' => true, |
|
| 838 | - 'explicit' => true |
|
| 839 | - ) + $DistributionPointName, |
|
| 836 | + 'constant' => 0, |
|
| 837 | + 'optional' => true, |
|
| 838 | + 'explicit' => true |
|
| 839 | + ) + $DistributionPointName, |
|
| 840 | 840 | 'reasons' => array( |
| 841 | - 'constant' => 1, |
|
| 842 | - 'optional' => true, |
|
| 843 | - 'implicit' => true |
|
| 844 | - ) + $ReasonFlags, |
|
| 841 | + 'constant' => 1, |
|
| 842 | + 'optional' => true, |
|
| 843 | + 'implicit' => true |
|
| 844 | + ) + $ReasonFlags, |
|
| 845 | 845 | 'cRLIssuer' => array( |
| 846 | - 'constant' => 2, |
|
| 847 | - 'optional' => true, |
|
| 848 | - 'implicit' => true |
|
| 849 | - ) + $GeneralNames |
|
| 846 | + 'constant' => 2, |
|
| 847 | + 'optional' => true, |
|
| 848 | + 'implicit' => true |
|
| 849 | + ) + $GeneralNames |
|
| 850 | 850 | ) |
| 851 | 851 | ); |
| 852 | 852 | |
@@ -861,20 +861,20 @@ discard block |
||
| 861 | 861 | 'type' => ASN1::TYPE_SEQUENCE, |
| 862 | 862 | 'children' => array( |
| 863 | 863 | 'keyIdentifier' => array( |
| 864 | - 'constant' => 0, |
|
| 865 | - 'optional' => true, |
|
| 866 | - 'implicit' => true |
|
| 867 | - ) + $this->KeyIdentifier, |
|
| 864 | + 'constant' => 0, |
|
| 865 | + 'optional' => true, |
|
| 866 | + 'implicit' => true |
|
| 867 | + ) + $this->KeyIdentifier, |
|
| 868 | 868 | 'authorityCertIssuer' => array( |
| 869 | - 'constant' => 1, |
|
| 870 | - 'optional' => true, |
|
| 871 | - 'implicit' => true |
|
| 872 | - ) + $GeneralNames, |
|
| 869 | + 'constant' => 1, |
|
| 870 | + 'optional' => true, |
|
| 871 | + 'implicit' => true |
|
| 872 | + ) + $GeneralNames, |
|
| 873 | 873 | 'authorityCertSerialNumber' => array( |
| 874 | - 'constant' => 2, |
|
| 875 | - 'optional' => true, |
|
| 876 | - 'implicit' => true |
|
| 877 | - ) + $CertificateSerialNumber |
|
| 874 | + 'constant' => 2, |
|
| 875 | + 'optional' => true, |
|
| 876 | + 'implicit' => true |
|
| 877 | + ) + $CertificateSerialNumber |
|
| 878 | 878 | ) |
| 879 | 879 | ); |
| 880 | 880 | |
@@ -895,12 +895,12 @@ discard block |
||
| 895 | 895 | 'children' => array( |
| 896 | 896 | 'policyIdentifier' => $CertPolicyId, |
| 897 | 897 | 'policyQualifiers' => array( |
| 898 | - 'type' => ASN1::TYPE_SEQUENCE, |
|
| 899 | - 'min' => 0, |
|
| 900 | - 'max' => -1, |
|
| 901 | - 'optional' => true, |
|
| 902 | - 'children' => $PolicyQualifierInfo |
|
| 903 | - ) |
|
| 898 | + 'type' => ASN1::TYPE_SEQUENCE, |
|
| 899 | + 'min' => 0, |
|
| 900 | + 'max' => -1, |
|
| 901 | + 'optional' => true, |
|
| 902 | + 'children' => $PolicyQualifierInfo |
|
| 903 | + ) |
|
| 904 | 904 | ) |
| 905 | 905 | ); |
| 906 | 906 | |
@@ -916,12 +916,12 @@ discard block |
||
| 916 | 916 | 'min' => 1, |
| 917 | 917 | 'max' => -1, |
| 918 | 918 | 'children' => array( |
| 919 | - 'type' => ASN1::TYPE_SEQUENCE, |
|
| 920 | - 'children' => array( |
|
| 921 | - 'issuerDomainPolicy' => $CertPolicyId, |
|
| 922 | - 'subjectDomainPolicy' => $CertPolicyId |
|
| 923 | - ) |
|
| 924 | - ) |
|
| 919 | + 'type' => ASN1::TYPE_SEQUENCE, |
|
| 920 | + 'children' => array( |
|
| 921 | + 'issuerDomainPolicy' => $CertPolicyId, |
|
| 922 | + 'subjectDomainPolicy' => $CertPolicyId |
|
| 923 | + ) |
|
| 924 | + ) |
|
| 925 | 925 | ); |
| 926 | 926 | |
| 927 | 927 | $KeyPurposeId = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER); |
@@ -954,15 +954,15 @@ discard block |
||
| 954 | 954 | 'type' => ASN1::TYPE_SEQUENCE, |
| 955 | 955 | 'children' => array( |
| 956 | 956 | 'notBefore' => array( |
| 957 | - 'constant' => 0, |
|
| 958 | - 'optional' => true, |
|
| 959 | - 'implicit' => true, |
|
| 960 | - 'type' => ASN1::TYPE_GENERALIZED_TIME), |
|
| 957 | + 'constant' => 0, |
|
| 958 | + 'optional' => true, |
|
| 959 | + 'implicit' => true, |
|
| 960 | + 'type' => ASN1::TYPE_GENERALIZED_TIME), |
|
| 961 | 961 | 'notAfter' => array( |
| 962 | - 'constant' => 1, |
|
| 963 | - 'optional' => true, |
|
| 964 | - 'implicit' => true, |
|
| 965 | - 'type' => ASN1::TYPE_GENERALIZED_TIME) |
|
| 962 | + 'constant' => 1, |
|
| 963 | + 'optional' => true, |
|
| 964 | + 'implicit' => true, |
|
| 965 | + 'type' => ASN1::TYPE_GENERALIZED_TIME) |
|
| 966 | 966 | ) |
| 967 | 967 | ); |
| 968 | 968 | |
@@ -973,16 +973,16 @@ discard block |
||
| 973 | 973 | 'children' => array( |
| 974 | 974 | 'base' => $GeneralName, |
| 975 | 975 | 'minimum' => array( |
| 976 | - 'constant' => 0, |
|
| 977 | - 'optional' => true, |
|
| 978 | - 'implicit' => true, |
|
| 979 | - 'default' => new BigInteger(0) |
|
| 980 | - ) + $BaseDistance, |
|
| 976 | + 'constant' => 0, |
|
| 977 | + 'optional' => true, |
|
| 978 | + 'implicit' => true, |
|
| 979 | + 'default' => new BigInteger(0) |
|
| 980 | + ) + $BaseDistance, |
|
| 981 | 981 | 'maximum' => array( |
| 982 | - 'constant' => 1, |
|
| 983 | - 'optional' => true, |
|
| 984 | - 'implicit' => true, |
|
| 985 | - ) + $BaseDistance |
|
| 982 | + 'constant' => 1, |
|
| 983 | + 'optional' => true, |
|
| 984 | + 'implicit' => true, |
|
| 985 | + ) + $BaseDistance |
|
| 986 | 986 | ) |
| 987 | 987 | ); |
| 988 | 988 | |
@@ -997,15 +997,15 @@ discard block |
||
| 997 | 997 | 'type' => ASN1::TYPE_SEQUENCE, |
| 998 | 998 | 'children' => array( |
| 999 | 999 | 'permittedSubtrees' => array( |
| 1000 | - 'constant' => 0, |
|
| 1001 | - 'optional' => true, |
|
| 1002 | - 'implicit' => true |
|
| 1003 | - ) + $GeneralSubtrees, |
|
| 1000 | + 'constant' => 0, |
|
| 1001 | + 'optional' => true, |
|
| 1002 | + 'implicit' => true |
|
| 1003 | + ) + $GeneralSubtrees, |
|
| 1004 | 1004 | 'excludedSubtrees' => array( |
| 1005 | - 'constant' => 1, |
|
| 1006 | - 'optional' => true, |
|
| 1007 | - 'implicit' => true |
|
| 1008 | - ) + $GeneralSubtrees |
|
| 1005 | + 'constant' => 1, |
|
| 1006 | + 'optional' => true, |
|
| 1007 | + 'implicit' => true |
|
| 1008 | + ) + $GeneralSubtrees |
|
| 1009 | 1009 | ) |
| 1010 | 1010 | ); |
| 1011 | 1011 | |
@@ -1026,11 +1026,11 @@ discard block |
||
| 1026 | 1026 | 'children' => array( |
| 1027 | 1027 | 'organization' => $DisplayText, |
| 1028 | 1028 | 'noticeNumbers' => array( |
| 1029 | - 'type' => ASN1::TYPE_SEQUENCE, |
|
| 1030 | - 'min' => 1, |
|
| 1031 | - 'max' => 200, |
|
| 1032 | - 'children' => array('type' => ASN1::TYPE_INTEGER) |
|
| 1033 | - ) |
|
| 1029 | + 'type' => ASN1::TYPE_SEQUENCE, |
|
| 1030 | + 'min' => 1, |
|
| 1031 | + 'max' => 200, |
|
| 1032 | + 'children' => array('type' => ASN1::TYPE_INTEGER) |
|
| 1033 | + ) |
|
| 1034 | 1034 | ) |
| 1035 | 1035 | ); |
| 1036 | 1036 | |
@@ -1038,13 +1038,13 @@ discard block |
||
| 1038 | 1038 | 'type' => ASN1::TYPE_SEQUENCE, |
| 1039 | 1039 | 'children' => array( |
| 1040 | 1040 | 'noticeRef' => array( |
| 1041 | - 'optional' => true, |
|
| 1042 | - 'implicit' => true |
|
| 1043 | - ) + $NoticeReference, |
|
| 1041 | + 'optional' => true, |
|
| 1042 | + 'implicit' => true |
|
| 1043 | + ) + $NoticeReference, |
|
| 1044 | 1044 | 'explicitText' => array( |
| 1045 | - 'optional' => true, |
|
| 1046 | - 'implicit' => true |
|
| 1047 | - ) + $DisplayText |
|
| 1045 | + 'optional' => true, |
|
| 1046 | + 'implicit' => true |
|
| 1047 | + ) + $DisplayText |
|
| 1048 | 1048 | ) |
| 1049 | 1049 | ); |
| 1050 | 1050 | |
@@ -1073,11 +1073,11 @@ discard block |
||
| 1073 | 1073 | 'children' => array( |
| 1074 | 1074 | 'type' => $AttributeType, |
| 1075 | 1075 | 'value'=> array( |
| 1076 | - 'type' => ASN1::TYPE_SET, |
|
| 1077 | - 'min' => 1, |
|
| 1078 | - 'max' => -1, |
|
| 1079 | - 'children' => $this->AttributeValue |
|
| 1080 | - ) |
|
| 1076 | + 'type' => ASN1::TYPE_SET, |
|
| 1077 | + 'min' => 1, |
|
| 1078 | + 'max' => -1, |
|
| 1079 | + 'children' => $this->AttributeValue |
|
| 1080 | + ) |
|
| 1081 | 1081 | ) |
| 1082 | 1082 | ); |
| 1083 | 1083 | |
@@ -1101,16 +1101,16 @@ discard block |
||
| 1101 | 1101 | 'type' => ASN1::TYPE_SEQUENCE, |
| 1102 | 1102 | 'children' => array( |
| 1103 | 1103 | 'version' => array( |
| 1104 | - 'type' => ASN1::TYPE_INTEGER, |
|
| 1105 | - 'mapping' => array('v1') |
|
| 1106 | - ), |
|
| 1104 | + 'type' => ASN1::TYPE_INTEGER, |
|
| 1105 | + 'mapping' => array('v1') |
|
| 1106 | + ), |
|
| 1107 | 1107 | 'subject' => $this->Name, |
| 1108 | 1108 | 'subjectPKInfo' => $SubjectPublicKeyInfo, |
| 1109 | 1109 | 'attributes' => array( |
| 1110 | - 'constant' => 0, |
|
| 1111 | - 'optional' => true, |
|
| 1112 | - 'implicit' => true |
|
| 1113 | - ) + $Attributes, |
|
| 1110 | + 'constant' => 0, |
|
| 1111 | + 'optional' => true, |
|
| 1112 | + 'implicit' => true |
|
| 1113 | + ) + $Attributes, |
|
| 1114 | 1114 | ) |
| 1115 | 1115 | ); |
| 1116 | 1116 | |
@@ -1126,39 +1126,39 @@ discard block |
||
| 1126 | 1126 | $RevokedCertificate = array( |
| 1127 | 1127 | 'type' => ASN1::TYPE_SEQUENCE, |
| 1128 | 1128 | 'children' => array( |
| 1129 | - 'userCertificate' => $CertificateSerialNumber, |
|
| 1130 | - 'revocationDate' => $Time, |
|
| 1131 | - 'crlEntryExtensions' => array( |
|
| 1132 | - 'optional' => true |
|
| 1133 | - ) + $this->Extensions |
|
| 1134 | - ) |
|
| 1129 | + 'userCertificate' => $CertificateSerialNumber, |
|
| 1130 | + 'revocationDate' => $Time, |
|
| 1131 | + 'crlEntryExtensions' => array( |
|
| 1132 | + 'optional' => true |
|
| 1133 | + ) + $this->Extensions |
|
| 1134 | + ) |
|
| 1135 | 1135 | ); |
| 1136 | 1136 | |
| 1137 | 1137 | $TBSCertList = array( |
| 1138 | 1138 | 'type' => ASN1::TYPE_SEQUENCE, |
| 1139 | 1139 | 'children' => array( |
| 1140 | 1140 | 'version' => array( |
| 1141 | - 'optional' => true, |
|
| 1142 | - 'default' => 'v1' |
|
| 1143 | - ) + $Version, |
|
| 1141 | + 'optional' => true, |
|
| 1142 | + 'default' => 'v1' |
|
| 1143 | + ) + $Version, |
|
| 1144 | 1144 | 'signature' => $AlgorithmIdentifier, |
| 1145 | 1145 | 'issuer' => $this->Name, |
| 1146 | 1146 | 'thisUpdate' => $Time, |
| 1147 | 1147 | 'nextUpdate' => array( |
| 1148 | - 'optional' => true |
|
| 1149 | - ) + $Time, |
|
| 1148 | + 'optional' => true |
|
| 1149 | + ) + $Time, |
|
| 1150 | 1150 | 'revokedCertificates' => array( |
| 1151 | - 'type' => ASN1::TYPE_SEQUENCE, |
|
| 1152 | - 'optional' => true, |
|
| 1153 | - 'min' => 0, |
|
| 1154 | - 'max' => -1, |
|
| 1155 | - 'children' => $RevokedCertificate |
|
| 1156 | - ), |
|
| 1151 | + 'type' => ASN1::TYPE_SEQUENCE, |
|
| 1152 | + 'optional' => true, |
|
| 1153 | + 'min' => 0, |
|
| 1154 | + 'max' => -1, |
|
| 1155 | + 'children' => $RevokedCertificate |
|
| 1156 | + ), |
|
| 1157 | 1157 | 'crlExtensions' => array( |
| 1158 | - 'constant' => 0, |
|
| 1159 | - 'optional' => true, |
|
| 1160 | - 'explicit' => true |
|
| 1161 | - ) + $this->Extensions |
|
| 1158 | + 'constant' => 0, |
|
| 1159 | + 'optional' => true, |
|
| 1160 | + 'explicit' => true |
|
| 1161 | + ) + $this->Extensions |
|
| 1162 | 1162 | ) |
| 1163 | 1163 | ); |
| 1164 | 1164 | |
@@ -1174,7 +1174,7 @@ discard block |
||
| 1174 | 1174 | $this->CRLNumber = array('type' => ASN1::TYPE_INTEGER); |
| 1175 | 1175 | |
| 1176 | 1176 | $this->CRLReason = array('type' => ASN1::TYPE_ENUMERATED, |
| 1177 | - 'mapping' => array( |
|
| 1177 | + 'mapping' => array( |
|
| 1178 | 1178 | 'unspecified', |
| 1179 | 1179 | 'keyCompromise', |
| 1180 | 1180 | 'cACompromise', |
@@ -1229,7 +1229,7 @@ discard block |
||
| 1229 | 1229 | 'default' => false, |
| 1230 | 1230 | 'implicit' => true |
| 1231 | 1231 | ) |
| 1232 | - ) |
|
| 1232 | + ) |
|
| 1233 | 1233 | ); |
| 1234 | 1234 | |
| 1235 | 1235 | $this->InvalidityDate = array('type' => ASN1::TYPE_GENERALIZED_TIME); |
@@ -4581,7 +4581,7 @@ discard block |
||
| 4581 | 4581 | |
| 4582 | 4582 | $i = count($rclist); |
| 4583 | 4583 | $rclist[] = array('userCertificate' => $serial, |
| 4584 | - 'revocationDate' => $this->_timeField(@date('D, d M Y H:i:s O'))); |
|
| 4584 | + 'revocationDate' => $this->_timeField(@date('D, d M Y H:i:s O'))); |
|
| 4585 | 4585 | return $i; |
| 4586 | 4586 | } |
| 4587 | 4587 | |
