octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-27 19:54:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,264 Commits 4 Branches 123 Tags 21 MiB
a0d21b6321
Commit Graph

236 Commits

Author SHA1 Message Date
Andreas Fischer
9fbc0358bb Merge branch '1.0' into 2.0 
* 1.0:
  X509: updates to getOID() as suggested by bantu
  X509: add getOID() method
 2015-09-02 15:06:35 +02:00
Dmitry Balabka
70dd67c4d9 Connection reuse refactoring to rid of globals 2015-09-01 21:50:30 +03:00
Cameron Eagans
2b75c37cc9 Convert most instances of function_exists() to extension_loaded() where applicable 2015-09-01 14:32:22 -04:00
Cameron Eagans
a84699a346 Switch to extension_loaded instead of function_exists where it makes sense 2015-09-01 14:22:12 -04:00
terrafrost
d7d9d782b0 X509: add getOID() method 2015-08-29 22:15:04 -05:00
Andreas Fischer
0f1d043428 Merge branch '1.0' into 2.0 
* 1.0:
  Tests/X509: add unit test showing need for return by reference
 2015-08-24 14:02:39 +02:00
Andreas Fischer
e391fdbd27 Merge pull request #772 from terrafrost/x509_unit_test 
Tests/X509: add unit test showing need for return by reference

* terrafrost/x509_unit_test:
  Tests/X509: add unit test showing need for return by reference
 2015-08-24 14:01:41 +02:00
Andreas Fischer
785b37b505 Remove include statement from BigInteger TestCase. 
This was previously required to load MATH_BIGINTEGER_MODE_* constants, but
these are autoloadable via \phpseclib\Math\BigInteger::MODE_* now and the
include path was removed.
 2015-08-13 15:12:20 -04:00
Andreas Fischer
54a1aeeefe Merge branch '1.0' into 2.0 
* 1.0:
  Tests/RSA: add PSS test
  RSA: fix regression for PSS signatures
 2015-08-13 14:37:15 -04:00
terrafrost
a56e0daf07 Tests/X509: add unit test showing need for return by reference 2015-08-13 10:22:01 -05:00
terrafrost
f591962fc4 Tests/RSA: add PSS test 2015-08-11 11:47:19 -05:00
Andreas Fischer
58f8affcad SSH2: Add support for curve25519-sha256@libssh.org.txt via libsodium-php. 2015-07-27 22:58:59 +02:00
Andreas Fischer
d9e9504fba Merge branch 'PSR2-1.0' into PSR2-2.0 
* PSR2-1.0:
  Fix indentation phpcbf did not fix.
  Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
  Use phpcbf to fix PHP code to ruleset.
  Ignore coding guidelines in ANSI switch block.
  Base code sniffer ruleset on PSR2 rather than PEAR.
  Update PHP Code Sniffer to 2.3.3

Conflicts:
	build/code-sniffer-ruleset-tests.xml
	build/code-sniffer-ruleset.xml
	composer.lock
	phpseclib/Crypt/DES.php
	phpseclib/Crypt/Hash.php
	phpseclib/Crypt/RSA.php
	phpseclib/File/X509.php
	phpseclib/Math/BigInteger.php
	phpseclib/Net/SFTP.php
	phpseclib/Net/SSH1.php
	phpseclib/Net/SSH2.php
	tests/Functional/Net/SFTPUserStoryTest.php
	tests/Unit/Crypt/TwofishTest.php
 2015-07-17 13:41:59 +02:00
Andreas Fischer
5eb205b237 Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception. 2015-07-17 12:57:41 +02:00
Andreas Fischer
2013a31ecd Use phpcbf to fix PHP code to ruleset. 2015-07-17 12:57:41 +02:00
Andreas Fischer
483c253879 Merge branch '1.0' into 2.0 
* 1.0:
  X509: set one more parameter to null
  X509: set another parameters field to null
 2015-06-30 12:27:06 +02:00
terrafrost
77c757d095 X509: set one more parameter to null 2015-06-29 22:10:18 -05:00
terrafrost
6c2798be90 X509: set another parameters field to null 2015-06-29 21:53:27 -05:00
terrafrost
815f443ed1 Merge branch 'x509-rsa-null-1.0' into x509-rsa-null-2.0-2 
Conflicts:
	tests/Unit/File/X509/X509Test.php
 2015-06-28 16:10:40 -05:00
terrafrost
2c8cb0b426 Tests/X509: CS adjustments 2015-06-28 14:52:07 -05:00
terrafrost
2277c0fbac Tests/X509: typo 2015-06-28 11:40:34 -05:00
terrafrost
46a3c0fbbb X509: set parameter field to null for RSA keys 2015-06-28 11:32:42 -05:00
Andreas Fischer
ecdd97f8a8 Merge pull request #702 from terrafrost/asn1-fix-2.0 
ASN1 parsing fix for issue mainly effecting CSR's for 2.0 branch

* terrafrost/asn1-fix-2.0:
  Tests/X509: PHP5 adjustments
  ASN1: handle malformed input better
  Tests/X509/CSR: add unit test for ASN1 changes
  ASN1: constructed context-specific tags can have x sub elements
 2015-06-16 16:30:46 +02:00
Andreas Fischer
a79b4ac6ad Merge pull request #699 from terrafrost/asn1-fix-1.0 
ASN1 parsing fix for issue mainly effecting CSR's for 1.0 branch

* terrafrost/asn1-fix-1.0:
  ASN1: handle malformed input better
  Tests/X509/CSR: add unit test for ASN1 changes
  ASN1: constructed context-specific tags can have x sub elements
 2015-06-16 16:30:35 +02:00
Andreas Fischer
902e41a2a4 Merge pull request #693 from terrafrost/rsa-none-2.0 
add "none" encryption mode for 2.0 branch

* terrafrost/rsa-none-2.0:
  Tests/RSA: pack expected result
  Tests/RSA: pack expected result
  Tests/RSA: re-added accidentally removed $rsa initialization
  Tests/RSA: use correct constant
  Tests/RSA: fix error
  Tests/RSA: hard-coded key and result
  RSA: add "none" encryption mode
 2015-06-09 17:19:16 +02:00
Andreas Fischer
956607d4e0 Merge pull request #692 from terrafrost/rsa-none-1.0 
add "none" encryption mode for 1.0 branch

* terrafrost/rsa-none-1.0:
  Tests/RSA: pack expected result
  Tests/RSA: re-added accidentally removed $rsa initialization
  Tests/RSA: fix error
  Tests/RSA: hard-coded key and result
  RSA: add "none" encryption mode
 2015-06-09 17:18:47 +02:00
terrafrost
49ee6d7fd2 Tests/X509: PHP5 adjustments 2015-06-07 10:30:55 -05:00
terrafrost
22b10c6a3a Merge branch 'asn1-fix-1.0' into asn1-fix-2.0 2015-06-07 10:24:11 -05:00
terrafrost
1ecd006685 Tests/X509/CSR: add unit test for ASN1 changes 2015-06-04 23:08:55 -05:00
terrafrost
ab489801fe Tests/RSA: pack expected result 2015-05-31 10:07:18 -05:00
terrafrost
2536d224ee Tests/RSA: pack expected result 2015-05-31 10:06:13 -05:00
terrafrost
6bce2c79ac Tests/RSA: re-added accidentally removed $rsa initialization 2015-05-31 09:20:03 -05:00
terrafrost
1316fd45f4 Tests/RSA: use correct constant 2015-05-31 09:17:53 -05:00
terrafrost
0166d3a7ec Tests/RSA: fix error 2015-05-31 02:20:16 -05:00
terrafrost
71104e8120 Merge branch 'rsa-none-1.0' into rsa-none-2.0 
Conflicts:
	tests/Unit/Crypt/RSA/ModeTest.php
 2015-05-31 02:19:06 -05:00
terrafrost
26d528855a Tests/RSA: hard-coded key and result 2015-05-31 02:13:11 -05:00
terrafrost
30260f3321 Merge branch 'rsa-none-1.0' into rsa-none-2.0 
Conflicts:
	phpseclib/Crypt/RSA.php
 2015-05-25 22:36:10 -05:00
terrafrost
1d924cfc7b RSA: add "none" encryption mode 2015-05-25 22:30:38 -05:00
terrafrost
6c345acc1d ANSI: PHP5 updates 2015-05-23 18:23:40 -05:00
terrafrost
e4fee53c93 Merge branch 'ansi-updates-1.0' into ansi-updates-2.0 2015-05-23 18:18:22 -05:00
terrafrost
4f19085e68 Tests: add ANSI unit test 2015-05-23 17:41:16 -05:00
terrafrost
f19bf7a07d RSA: backport getPublicKeyFingerprint from Lukas-W's PR 2015-05-06 22:55:12 -05:00
Lukas W
a67f4df164 RSA: Add support for calculating a public key's fingerprint 2015-05-04 09:21:37 +02:00
terrafrost
d00e20a140 Merge remote-tracking branch 'graham/1.0-phpdoc' into 2.0-phpdoc 
Conflicts:
	phpseclib/Crypt/Base.php
	phpseclib/Net/SCP.php
	tests/Unit/File/ASN1Test.php
 2015-04-16 00:42:53 -05:00
terrafrost
9f626c67b6 Merge remote-tracking branch 'graham/1.0-phpdoc' into 1.0-phpdoc 2015-04-16 00:31:54 -05:00
terrafrost
188cef4665 Tests/DES: method is testing decryption - not encryption 2015-04-02 22:20:02 -05:00
terrafrost
46d22b962d yet another typo in unit test 2015-04-02 07:07:58 -05:00
terrafrost
4c8a56f2ad Tests: more typos 2015-04-02 06:43:33 -05:00
terrafrost
1fa4734acd Tests/Blowfish - fix typo 2015-04-02 06:31:36 -05:00
terrafrost
ebcb3130b7 Merge branch 'openssl-support' into 2.0 
Conflicts:
	phpseclib/Crypt/AES.php
	phpseclib/Crypt/Base.php
	phpseclib/Crypt/Blowfish.php
	phpseclib/Crypt/DES.php
	phpseclib/Crypt/RC2.php
	phpseclib/Crypt/RC4.php
	phpseclib/Crypt/Rijndael.php
	phpseclib/Crypt/TripleDES.php
	phpseclib/Crypt/Twofish.php
	phpseclib/Net/SSH2.php
	tests/Functional/Net/SFTPLargeFileTest.php
	tests/Unit/Crypt/AES/InternalTest.php
	tests/Unit/Crypt/AES/McryptTest.php
	tests/Unit/Crypt/AES/TestCase.php
 2015-04-02 05:32:31 -05:00
Graham Campbell
e50cbacd4e Fixed some phpdocs 2015-03-29 17:07:17 +01:00
terrafrost
8f81fc8f28 Merge branch '1.0' of https://github.com/phpseclib/phpseclib into openssl-support 2015-03-15 02:45:32 -05:00
Andreas Fischer
f57e01df65 Merge branch '1.0' into 2.0 
* 1.0:
  Tests/X509: add unit test
  X509: make it so you can use File_ASN1_Element for custom X.509 extensions
 2015-03-10 13:46:15 +01:00
terrafrost
dad8a9ef37 Tests/X509: add unit test 2015-03-10 01:39:13 -05:00
Andreas Fischer
63ed03b119 Merge branch '1.0' into 2.0 
* 1.0:
  Tests/X509: swap expected and actual value
  Tests/X509: fix unit test
  Tests/X509: add unit test for unsupported extension encoding
  X509: always base64-encode extensions for which _getMapping returns a bool
 2015-03-05 15:37:46 +01:00
terrafrost
31e2308ea9 Tests/X509: swap expected and actual value 2015-03-04 23:37:33 -06:00
terrafrost
cc08406a76 Tests/X509: fix unit test 2015-03-04 08:18:54 -06:00
terrafrost
3e1aa8c213 Tests/X509: add unit test for unsupported extension encoding 2015-03-04 08:03:02 -06:00
terrafrost
fbfc935a1e Tests/RC2: rm space 2015-01-26 20:06:01 -06:00
terrafrost
a467c9e0bd Tests/RC2: use data provider 2015-01-26 19:51:57 -06:00
terrafrost
8b8d9ac423 Tests/RC2: add test vectors 2015-01-26 19:24:48 -06:00
terrafrost
808a460f15 Tests/Twofish: disable padding 2015-01-19 22:00:49 -06:00
terrafrost
06d9f07830 Tests/Twofish: fix E_NOTICE 2015-01-19 21:19:12 -06:00
terrafrost
b852e8c6cb Tests: add twofish unit test 2015-01-19 20:52:25 -06:00
terrafrost
c90010297c Tests/TripleDES: CS adjustments 2015-01-17 10:33:12 -06:00
terrafrost
eaf2397cb6 Tests/TripleDES: fix one last error 2015-01-17 10:17:23 -06:00
terrafrost
1547ec497a Tests/TripleDES: another syntax error 2015-01-17 10:04:01 -06:00
terrafrost
fb41f3492b Tests/TripleDES: fix syntax error 2015-01-17 09:56:32 -06:00
terrafrost
e9470d1fc5 TripleDES: updates to accomodate inner chaining 2015-01-17 09:42:47 -06:00
terrafrost
0f01128e98 Tests/AES: change CRYPT_AES_MODE_* -> CRYPT_MODE_* 2015-01-16 20:27:43 -06:00
terrafrost
f1b41e2782 Tests/AES: pack everything 2015-01-14 22:46:46 -06:00
terrafrost
7efc032d4b Tests/AES: pass everything through bin2hex 
(i thought this was already being done..)
 2015-01-14 21:05:34 -06:00
terrafrost
569967de20 Tests/Blowfish: CS adjustments 2015-01-14 20:28:23 -06:00
terrafrost
cd57289555 Tests/AES: attempt to fix failing unit test 2015-01-14 20:19:03 -06:00
terrafrost
009d883d4c Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support 2015-01-14 20:13:08 -06:00
Andreas Fischer
38e6196127 Merge branch 'master' into php5 
* master:
  ASN1: empty constructed context-specific tags error'd out

Conflicts:
	phpseclib/File/ASN1.php
 2015-01-11 16:09:50 +01:00
terrafrost
84325d415e ASN1: empty constructed context-specific tags error'd out 
eg. an attributes field in a CSR that's blank
 2015-01-10 23:58:50 -06:00
terrafrost
3485242ef6 Tests/AES: pack plaintext prior to encryption 2015-01-07 22:55:35 -06:00
terrafrost
8713e94001 Tests/AES: disable padding 2015-01-07 21:36:02 -06:00
terrafrost
b34a05887c Tests: add Blowfish test 2015-01-07 21:23:04 -06:00
terrafrost
e75d94663e Tests/AES: use bin2hex for result comparison 2015-01-07 21:14:02 -06:00
terrafrost
4766973e61 Tests/AES: add official test vectors to test 2015-01-01 23:56:01 -06:00
terrafrost
dffde1fffc Tests/AES: rm last two commits - this info can already be derived 2014-12-31 23:02:22 -06:00
terrafrost
289ef9a2b7 Tests/AES: improve error message for continuous buffer test as well 2014-12-31 22:46:16 -06:00
terrafrost
bb6689add3 Tests/AES: use better error message 2014-12-31 22:32:55 -06:00
terrafrost
805c99458b Tests/TripleDES: fix data provider for new test vectors 2014-12-31 19:18:57 -06:00
terrafrost
9199e624b2 Tests/TripleDES: add more test vectors 2014-12-31 15:41:43 -06:00
terrafrost
50a0ae7b6e Test/AES: don't test stuff with only one buffer 2014-12-31 15:15:15 -06:00
terrafrost
f9451c826a Tests/AES: add testNonContinuousBufferBatteryCombos 2014-12-31 15:00:54 -06:00
terrafrost
162e2f26cf Tests/SSH2: syntax error 2014-12-30 00:57:01 -06:00
terrafrost
46f81c98ab Tests/SSH2: update testGenerateIdentifier test 2014-12-30 00:27:27 -06:00
terrafrost
cf17141930 Tests/TripleDES: disable padding 2014-12-29 10:25:31 -06:00
terrafrost
09c03d0f75 Tests/DES: the expeted output of testDecryptPadding() was incorrect 
(the expected output can be obtained by setting the key and iv both to 'd')
 2014-12-28 23:15:45 -06:00
terrafrost
1d2a85a319 another fix for 3DES unit test 2014-12-25 10:09:04 -06:00
terrafrost
7ea7463855 fix 3DES unit test 2014-12-25 09:47:36 -06:00
terrafrost
f891410b3d add 3DES unit test 2014-12-25 03:09:37 -06:00
terrafrost
432700db8f Tests/RC4: key is already packed 2014-12-21 10:16:37 -06:00
terrafrost
45a5c05da6 Tests: rename tests so that they actually run 2014-12-21 09:54:44 -06:00
terrafrost
7c5e7a0a72 Tests/RC4: engines weren't being set correctly 2014-12-20 13:17:15 -06:00
terrafrost
31dcbc919c Tests/RC4: add more RC4 test vectors 2014-12-20 12:47:47 -06:00