1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-12 09:09:39 +01:00
Commit Graph

1421 Commits

Author SHA1 Message Date
Andreas Fischer
7e2289656a Merge branch 'master' into php5
* master:
  SFTP/Stream: fix capatilization
  SFTP/Stream: add explanation as to why nlist() is used here
  SFTP/Stream: use $scheme instead of 'sftp'
2014-05-30 00:00:05 +02:00
Andreas Fischer
6805704b4f Merge pull request #352 from terrafrost/sftp-stream-changes
SFTP Stream changes

* terrafrost/sftp-stream-changes:
  SFTP/Stream: fix capatilization
  SFTP/Stream: add explanation as to why nlist() is used here
  SFTP/Stream: use $scheme instead of 'sftp'
2014-05-30 00:00:04 +02:00
terrafrost
7252017268 SFTP/Stream: fix capatilization 2014-05-29 16:49:04 -05:00
terrafrost
7c08ab71d3 BigInteger: "be less overly clever loading Crypt/Random"
pretty much the same as this commit:

28f18f83ec
2014-05-29 16:31:26 -05:00
terrafrost
c0e3795319 SFTP/Stream: add explanation as to why nlist() is used here 2014-05-29 16:23:28 -05:00
terrafrost
3dd92e56e4 SFTP/Stream: use $scheme instead of 'sftp'
This makes it easier for someone to change the scheme (which can be
done by changng the stream_wrapper_register call at the bottom
of the file)
2014-05-29 16:14:03 -05:00
Andreas Fischer
712f820a26 Merge branch 'master' into php5
* master:
  SSH2: 0x7FFFFFFF -> $this->window_size in one more place
  SSH2: make it so callback functions can make exec() return early
2014-05-28 00:39:40 +02:00
Andreas Fischer
aa5f9b77ec Merge pull request #349 from terrafrost/ssh2-exec-callback-termination
SSH2: make it so callback functions can make exec() return early

* terrafrost/ssh2-exec-callback-termination:
  SSH2: 0x7FFFFFFF -> $this->window_size in one more place
  SSH2: make it so callback functions can make exec() return early
2014-05-28 00:39:40 +02:00
Andreas Fischer
5ff1c9a349 Merge branch 'master' into php5
* master:
  SFTP: NULL -> null
  SFTP: fix syntax error
  SFTP: add more stat functions
2014-05-28 00:02:23 +02:00
Andreas Fischer
fc57e3f9c9 Merge pull request #348 from terrafrost/more-sftp-changes
More sftp changes

* terrafrost/more-sftp-changes:
  SFTP: NULL -> null
  SFTP: fix syntax error
  SFTP: add more stat functions
2014-05-28 00:02:20 +02:00
Andreas Fischer
958430b5a8 Merge branch 'master' into php5
* master:
  Random: wrap crypt_random_string in a function_exists call
2014-05-27 12:24:52 +02:00
Andreas Fischer
05b265d791 Merge pull request #350 from terrafrost/crypt-random-string-function-exists
Random: wrap crypt_random_string in a function_exists call

* terrafrost/crypt-random-string-function-exists:
  Random: wrap crypt_random_string in a function_exists call
2014-05-27 12:24:52 +02:00
terrafrost
015d628183 Random: wrap crypt_random_string in a function_exists call 2014-05-26 18:32:36 -05:00
terrafrost
db32efb276 SSH2: 0x7FFFFFFF -> $this->window_size in one more place 2014-05-26 17:57:14 -05:00
terrafrost
0dd929341b SSH2: make it so callback functions can make exec() return early 2014-05-26 17:37:32 -05:00
terrafrost
c100264b65 SFTP: NULL -> null 2014-05-26 16:32:57 -05:00
terrafrost
46ae0da314 SFTP: fix syntax error 2014-05-26 15:42:14 -05:00
terrafrost
a7fa4cc4ff SFTP: add more stat functions
also don't use stat cache for SFTP/Stream.php
2014-05-26 15:39:30 -05:00
Andreas Fischer
30de331eb4 Merge pull request #347 from bantu/wrong-stat-cache-property
SFTP: Use the correct stat cache property: stat_cache

* bantu/wrong-stat-cache-property:
  SFTP: Use the correct stat cache property: stat_cache
2014-05-22 15:27:56 +02:00
Andreas Fischer
518eb861e9 Merge branch 'master' into php5
* master:
  SFTP: Use the correct stat cache property: stat_cache
2014-05-22 15:27:56 +02:00
Andreas Fischer
f1fbf9c5ae SFTP: Use the correct stat cache property: stat_cache 2014-05-22 13:32:39 +02:00
Andreas Fischer
39b9ffffdf Merge branch 'master' into php5
* master:
  SFTP: last commit had a few ommissions
  SFTP Functional tests: Make use of assertNotSame
  SFTP Functional tests: Keep story linear.
  SFTP: add more unit tests
2014-05-22 13:25:57 +02:00
Andreas Fischer
4e0b3a5c3c Merge pull request #344 from bantu/sftp-unit-test-updates
Sftp functional test updates

* bantu/sftp-unit-test-updates:
  SFTP: last commit had a few ommissions
  SFTP Functional tests: Make use of assertNotSame
  SFTP Functional tests: Keep story linear.
  SFTP: add more unit tests
2014-05-22 13:25:42 +02:00
Andreas Fischer
623f17893b Merge pull request #346 from terrafrost/sftp-fix-last-commit-ommissions
SFTP: last commit had a few ommissions

* terrafrost/sftp-fix-last-commit-ommissions:
  SFTP: last commit had a few ommissions
2014-05-22 13:15:57 +02:00
terrafrost
1ddcd6d873 SFTP: last commit had a few ommissions 2014-05-21 19:55:12 -05:00
Andreas Fischer
5afc865775 SFTP Functional tests: Make use of assertNotSame 2014-05-22 00:40:49 +02:00
Andreas Fischer
8a43f02ae9 SFTP Functional tests: Keep story linear. 2014-05-22 00:40:49 +02:00
terrafrost
6e8e44b120 SFTP: add more unit tests 2014-05-22 00:40:49 +02:00
Andreas Fischer
4524b9f663 Merge branch 'master' into php5
* master:
  SFTP: stat cache updates
  SFTP: Rudimentary tests for file_exists(), is_file(), is_dir().
2014-05-21 17:55:42 +02:00
Andreas Fischer
69e15b3855 Merge pull request #342 from terrafrost/sftp-statcache-changes
SFTP: stat cache updates

* terrafrost/sftp-statcache-changes:
  SFTP: stat cache updates
2014-05-21 17:55:21 +02:00
Andreas Fischer
40d29b13d6 Merge pull request #341 from bantu/sftp-changes-20140510
SFTP: Rudimentary tests for file_exists(), is_file(), is_dir().

* bantu/sftp-changes-20140510:
  SFTP: Rudimentary tests for file_exists(), is_file(), is_dir().
2014-05-21 17:53:49 +02:00
terrafrost
4d9214970b SFTP: stat cache updates 2014-05-21 10:20:36 -05:00
Andreas Fischer
6b2b01347f Merge branch 'master' into php5
* master:
  SFTP: use_cache -> use_stat_cache
  SFTP: switch from using file existence cache to stat cache, like PHP
  SFTP: add support for recursive nlist and rawlist
  SFTP: add file_exists, is_dir and is_file functions
2014-05-18 23:21:17 +02:00
Andreas Fischer
7d2a3279c6 Merge pull request #338 from terrafrost/sftp-changes-20140510
SFTP: add file_exists, is_dir and is_file functions

* terrafrost/sftp-changes-20140510:
  SFTP: use_cache -> use_stat_cache
  SFTP: switch from using file existence cache to stat cache, like PHP
  SFTP: add support for recursive nlist and rawlist
  SFTP: add file_exists, is_dir and is_file functions
2014-05-18 23:20:58 +02:00
terrafrost
36fa9e4e48 SFTP: use_cache -> use_stat_cache 2014-05-18 15:55:12 -05:00
terrafrost
e09a6968da SFTP: switch from using file existence cache to stat cache, like PHP
also add a few new functions - is_link and filesize
2014-05-18 15:34:10 -05:00
Andreas Fischer
e0e62360df SFTP: Rudimentary tests for file_exists(), is_file(), is_dir(). 2014-05-14 01:11:19 +02:00
terrafrost
0a0398268a SFTP: add support for recursive nlist and rawlist 2014-05-13 17:10:32 -05:00
terrafrost
77641003fa SFTP: add file_exists, is_dir and is_file functions
also expand caching layer
2014-05-10 19:52:38 -05:00
Andreas Fischer
b7ebb1e0e3 Merge branch 'master' into php5
* master:
  BigInteger: speedup internal mode slightly
2014-05-06 00:49:46 +02:00
Andreas Fischer
3a309d36ed Merge pull request #335 from terrafrost/internal-mode-speedup
BigInteger: speedup internal mode slightly

* terrafrost/internal-mode-speedup:
  BigInteger: speedup internal mode slightly
2014-05-06 00:49:44 +02:00
Andreas Fischer
1821f6b28f Merge branch 'master' into php5
* master:
  ASN1: let strings in as well
  ASN1: make File_ASN1 accept int primitives and not just Math_BigInteger objects when an integer is expected
2014-05-06 00:41:59 +02:00
Andreas Fischer
755d2106cb Merge pull request #336 from terrafrost/asn1-int
ASN1: make File_ASN1 accept int primitives and not just Math_BigInteger ...

* terrafrost/asn1-int:
  ASN1: let strings in as well
  ASN1: make File_ASN1 accept int primitives and not just Math_BigInteger objects when an integer is expected
2014-05-06 00:41:56 +02:00
terrafrost
1b9c599476 ASN1: let strings in as well 2014-05-05 17:38:33 -05:00
terrafrost
7a9ea673ca ASN1: make File_ASN1 accept int primitives and not just Math_BigInteger objects when an integer is expected
The code to convert the regular integer type into the appropriate format could all just be in-line'd when an integer primitive is used but this approach is easier to read.
2014-05-05 16:39:35 -05:00
terrafrost
309c8fd555 BigInteger: speedup internal mode slightly
Changes should yield a slight speedup per the analysis at https://github.com/phpseclib/phpseclib/pull/317#issuecomment-42122335
2014-05-05 11:34:45 -05:00
Andreas Fischer
33aaf1431a Merge branch 'master' into php5
* master:
  Skip testDiffieHellmanKeyAgreement on TravisCI+5.3.3+Internal in the meantime.
  Remove randomness from testDiffieHellmanKeyAgreement.
  Link testDiffieHellmanKeyAgreement to corresponding bug ticket.
  Add Diffie-Hellman Test to BigInteger Testcase.
2014-05-05 11:34:26 +02:00
Andreas Fischer
4fd72af3a2 Merge pull request #317 from bantu/BigInteger-DiffieHellman-Test
Add Diffie-Hellman Test to BigInteger Testcase.

* bantu/BigInteger-DiffieHellman-Test:
  Skip testDiffieHellmanKeyAgreement on TravisCI+5.3.3+Internal in the meantime.
  Remove randomness from testDiffieHellmanKeyAgreement.
  Link testDiffieHellmanKeyAgreement to corresponding bug ticket.
  Add Diffie-Hellman Test to BigInteger Testcase.
2014-05-05 11:34:16 +02:00
Andreas Fischer
602fb55195 Skip testDiffieHellmanKeyAgreement on TravisCI+5.3.3+Internal in the meantime. 2014-04-29 17:42:33 +02:00
Andreas Fischer
9e79fc2407 Remove randomness from testDiffieHellmanKeyAgreement. 2014-04-29 16:37:10 +02:00