danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2024-11-27 04:34:45 +01:00
Code Issues Projects Releases Wiki Activity
2,218 Commits 1 Branch 21 Tags 11 MiB
18cc8eb1c3
Commit Graph

408 Commits

Author SHA1 Message Date
Andreas Fischer
230cc88327 Merge branch '2.0' 
* 2.0:
  Removed the deprecated "--dev" argument from the recommended composer command.  When that argument is specified, composer prints the following:
 2015-11-10 10:23:08 +01:00
Andreas Fischer
2f5dbc1711 Merge pull request #868 from bantu/composer_test_message-2.0 
Removed the deprecated "--dev" argument from the recommended composer…

* bantu/composer_test_message-2.0:
  Removed the deprecated "--dev" argument from the recommended composer command.  When that argument is specified, composer prints the following:
 2015-11-10 10:23:08 +01:00
Andreas Fischer
3793f34876 Merge branch '2.0' 
* 2.0:
  RSA: fix issue with loading PKCS8 specific keys
  Tests/RSA: add unit test for loading PKCS8 specific keys
 2015-11-10 10:13:32 +01:00
Mark McEver
1a7d9aafd7 Removed the deprecated "--dev" argument from the recommended composer command. When that argument is specified, composer prints the following: 
You are using the deprecated option "dev". Dev packages are installed by default now.
 2015-11-10 09:49:19 +01:00
terrafrost
c34be16c3a Merge branch 'rsa-pkcs8-fix' into rsa-pkcs8-fix-2.0 
Conflicts:
	phpseclib/Crypt/RSA.php
 2015-11-09 23:10:21 -06:00
terrafrost
e8d75b2e8d Tests/RSA: add unit test for loading PKCS8 specific keys 2015-11-09 22:10:08 -06:00
terrafrost
43165d976c RSA: changes to OpenSSH and PuTTY plugins 2015-10-24 15:54:34 -05:00
terrafrost
7b1b7c22e2 RSA: throw an exception if the modulo is too small 2015-10-23 13:45:35 -05:00
terrafrost
1522e6606b RSA: add getSupportedFormats() and getLoadedFormat() 2015-10-22 10:57:05 -05:00
terrafrost
efe36d67ce Merge branch 'master' into rsa-plugins 
Conflicts:
	phpseclib/Crypt/RSA.php
 2015-10-22 10:16:52 -05:00
terrafrost
33bf6e42c3 Merge branch '2.0' 2015-10-22 10:14:50 -05:00
terrafrost
96dd14fd6f Merge branch 'extractber-fix' into extractber-fix-2.0 
Conflicts:
	phpseclib/File/X509.php
 2015-10-22 09:56:07 -05:00
terrafrost
46bb95a265 X509: improve base64-encoded detection rules 2015-10-22 09:45:40 -05:00
terrafrost
e2fcd9d951 RSA: misc fixes to select plugins 2015-10-21 21:24:12 -05:00
terrafrost
6eb5ea3ef7 RSA: add support for the microsoft BLOB key format 2015-10-20 23:17:11 -05:00
Andreas Fischer
a88047f242 Merge branch '2.0' 
* 2.0:
  Add test case for GitHub Issue 850: Realpath in SFTP chmod().
  Fixed a bug in SFTP::chmod not using realpath on the filepath
 2015-10-19 00:19:08 +02:00
Andreas Fischer
1cf70d27e8 Merge branch '1.0' into 2.0 
* 1.0:
  Add test case for GitHub Issue 850: Realpath in SFTP chmod().
  Fixed a bug in SFTP::chmod not using realpath on the filepath
 2015-10-19 00:19:07 +02:00
Andreas Fischer
579e51c58f Add test case for GitHub Issue 850: Realpath in SFTP chmod(). 2015-10-19 00:07:55 +02:00
terrafrost
ad55d3cd75 RSA: fixes to last non-merge commit 2015-10-16 14:04:17 -05:00
terrafrost
31c14063fa RSA: updates to raw plugin 2015-10-16 09:36:49 -05:00
terrafrost
177b52088d Merge branch '2.0' 2015-10-12 23:10:15 -05:00
terrafrost
da1a2df5aa Merge branch 'getkeylength-2.0-2' into 2.0 2015-10-12 23:09:04 -05:00
terrafrost
666092c889 Merge branch 'getkeylength' into 1.0 2015-10-12 22:59:46 -05:00
terrafrost
cfcf554531 RSA: changes to putty plugin and rm comment methods from rsa etc 2015-10-01 23:11:55 -05:00
terrafrost
fb22529c44 Tests/RSA: add unit test for new functionality 2015-10-01 20:11:11 -05:00
terrafrost
91887c957d Merge remote-tracking branch 'upstream/master' into rsa-plugins 
Conflicts:
	phpseclib/Crypt/RSA.php
	phpseclib/Net/SSH2.php
 2015-10-01 15:57:31 -05:00
terrafrost
ec3fe7277b RSA: move key format handling to plugins 2015-10-01 15:41:11 -05:00
Andreas Fischer
0ba1a04c05 Merge branch '2.0' 
* 2.0:
  SFTP: don't start in local file middle when uploading to middle of the remote file
  Tests/SFTP: updates to newly added unit test
  SFTP: backport DavidAnderson684's changes to 1.0 branch
  add unit test demo'ing issue # 830
 2015-09-30 17:28:03 +02:00
terrafrost
0f49fb86bf Merge branch 'sftp-endless-loop' into sftp-endless-loop-v2 
Conflicts:
	phpseclib/Net/SFTP.php
	tests/Functional/Net/SFTPUserStoryTest.php
 2015-09-29 21:51:20 -05:00
terrafrost
6688f650f1 SFTP: don't start in local file middle when uploading to middle of 
the remote file
 2015-09-29 21:39:35 -05:00
terrafrost
26ddf02fee Merge branch 'sftp-endless-loop' into sftp-endless-loop-v2 
Conflicts:
	phpseclib/Net/SFTP.php
 2015-09-28 09:20:38 -05:00
terrafrost
759e04f08e Tests/SFTP: updates to newly added unit test 2015-09-27 10:57:41 -05:00
terrafrost
23db2f7be3 add unit test demo'ing issue # 830 2015-09-27 10:54:08 -05:00
terrafrost
fab5a66fe5 RSA: make createKey static and make it return RSA objects 2015-09-24 09:43:19 -05:00
terrafrost
604dddc82b Merge branch 'getkeylength' into getkeylength-2.0-2 
Conflicts:
	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
 2015-09-22 21:26:00 -05:00
terrafrost
bfba3db1a7 Crypt: make it so the key length can be explicitly set for all ciphers 2015-09-20 12:24:06 -05:00
Andreas Fischer
3b33941d3d Merge pull request #813 from bantu/hash-rewrite 
[master] More work on Hash.php

* bantu/hash-rewrite:
  Hash: Cover remaining uncovered line.
  Hash: Update incorrect documentation, use max line length 80.
  Hash: Remove constructor return value documentation.
  Hash: Do not assign false to length property. It's documented as an int.
  Hash: Rename properly l to length.
  Slightly rework of HashTest.php.
 2015-09-14 22:47:37 +02:00
Andreas Fischer
5b6642ae37 Hash: Cover remaining uncovered line. 2015-09-14 01:34:20 +02:00
Andreas Fischer
3342eb6d09 Merge branch '2.0' 
* 2.0:
  Fixed another case
  Minor tweaks
  Fixed error
  More fixes
  PHPDoc fixes
 2015-09-14 01:27:11 +02:00
Andreas Fischer
4387b64426 Merge branch '1.0' into 2.0 
* 1.0:
  Fixed another case
  Minor tweaks
  Fixed error
  More fixes
  PHPDoc fixes

Conflicts:
	phpseclib/Crypt/Random.php
	phpseclib/Math/BigInteger.php
	phpseclib/Net/SSH2.php
	tests/Functional/Net/SFTPUserStoryTest.php
 2015-09-14 01:27:04 +02:00
Andreas Fischer
06a4cc5eba Slightly rework of HashTest.php. 2015-09-07 19:32:58 +02:00
terrafrost
57d5081948 Tests/Hash: tiger is buggy in PHP 5.3 2015-09-06 09:16:18 -05:00
terrafrost
d76ae873ac Hash: rm internal and mhash implementations (5.3 has hash built in) 2015-09-06 07:55:33 -05:00
Graham Campbell
eec8c9cb5d More fixes 2015-09-06 12:39:14 +01:00
Andreas Fischer
0deae03dca Merge branch '2.0' 
* 2.0:
  Remove unnecessary parens
  Convert most instances of function_exists() to extension_loaded() where applicable
  Remove conditions for PHP < 5.3.0 for this branch
  Switch to extension_loaded('gmp')
  Switch to extension_loaded instead of function_exists where it makes sense
 2015-09-04 15:05:50 +02:00
Andreas Fischer
864493bbf6 Merge pull request #790 from cweagans/switch-to-extension-loaded-2.0 
Switch to extension loaded (2.0)

* cweagans/switch-to-extension-loaded-2.0:
  Remove conditions for PHP < 5.3.0 for this branch
  Switch to extension_loaded('gmp')
  Switch to extension_loaded instead of function_exists where it makes sense
 2015-09-04 15:05:40 +02:00
Andreas Fischer
e08e2fd300 Merge pull request #791 from cweagans/switch-to-extension-loaded-1.0 
Switch to extension loaded (1.0)

* cweagans/switch-to-extension-loaded-1.0:
  Remove unnecessary parens
  Convert most instances of function_exists() to extension_loaded() where applicable
 2015-09-04 15:04:17 +02:00
Andreas Fischer
19d93fe76c Merge branch '2.0' 
* 2.0:
  X509: updates to getOID() as suggested by bantu
  X509: add getOID() method
 2015-09-02 15:06:40 +02:00
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