1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-11-30 04:39:21 +01:00
Commit Graph

1237 Commits

Author SHA1 Message Date
terrafrost
3f897cf48b Hash: fix unit tests 2014-08-10 14:54:36 -05:00
terrafrost
33182bb2de BigInteger: fix previous fix 2014-08-10 14:47:08 -05:00
terrafrost
fb2ecc6c18 Hash: refactor unit tests 2014-08-10 11:52:31 -05:00
Andreas Fischer
63974e9bbc Merge pull request #446 from terrafrost/hash-96-2
Hash: add sha256-96 and sha512-96

* terrafrost/hash-96-2:
  Hash: apply fixes to sha512 unit tests as well
  Hash: one more fix to unit test
  Hash: fix unit tests
  Hash: add unit tests
  Hash: add sha256-96 and sha512-96
2014-08-10 17:59:03 +02:00
terrafrost
4fa96e384c Hash: apply fixes to sha512 unit tests as well 2014-08-10 09:14:33 -05:00
terrafrost
a52315a0cb Hash: one more fix to unit test 2014-08-10 09:08:52 -05:00
Andreas Fischer
1de939fb4a Merge pull request #427 from terrafrost/ssh2-show-methods-before-login
SSH2: make it so negotiated algorithms can be seen before login

* terrafrost/ssh2-show-methods-before-login:
  SSH2: white space adjustment
  SSH: update getServerPublicHostKey() to use new _connect() method
  SSH2: fix if statement for conditional _connect() call
  simplify calls to $this->_connect()
  SSH2: make it so negotiated algorithms can be seen before login
2014-08-10 12:10:04 +02:00
terrafrost
04e263bb8c SSH2: white space adjustment 2014-08-10 02:09:28 -05:00
terrafrost
a906e83f2a Hash: fix unit tests 2014-08-10 02:07:54 -05:00
terrafrost
4ce7a0f63a BigInteger: small optimization to bitwise_not 2014-08-10 02:03:58 -05:00
terrafrost
e3136ccd13 Hash: add unit tests 2014-08-10 02:01:21 -05:00
terrafrost
085fb0ebb8 SSH: update getServerPublicHostKey() to use new _connect() method 2014-08-06 14:42:08 -05:00
terrafrost
88d6517d93 Hash: add sha256-96 and sha512-96
IPSec uses them and some versions of OpenSSH use them (even though RFC6668 makes no mention of them)
2014-08-05 23:27:11 -05:00
terrafrost
5b019b22d9 SSH2: fix if statement for conditional _connect() call 2014-08-05 19:30:14 -05:00
terrafrost
dffef50838 simplify calls to $this->_connect() 2014-08-04 20:11:34 -05:00
Andreas Fischer
c52441e7f2 Merge pull request #443 from terrafrost/runkit-fix
Unit tests: changing the mode with runkit causes issues with static vars

* terrafrost/runkit-fix:
  only use runkit functions if runkit isn't loaded
  Unit tests: changing the mode with runkit causes issues with static vars
2014-08-05 00:10:19 +02:00
terrafrost
c0731df4be only use runkit functions if runkit isn't loaded 2014-08-04 16:33:23 -05:00
Andreas Fischer
4d70e7eda1 Merge pull request #445 from bantu/travis-ci-install
Travis CI: before_script should be install. Overwrite before_install for 5.2.

* bantu/travis-ci-install:
  Travis CI: Overwrite before_install step. Default currently fails on PHP 5.2.
  Travis CI: before_script should be install.
2014-08-04 13:13:37 +02:00
Andreas Fischer
53db6c5530 Travis CI: Overwrite before_install step. Default currently fails on PHP 5.2. 2014-08-04 13:05:27 +02:00
Andreas Fischer
af1711f393 Travis CI: before_script should be install. 2014-08-04 13:05:27 +02:00
Andreas Fischer
833a595047 Merge pull request #442 from bantu/readme-documentation-section
Add "Documentation" section to README. Add link to Sami.

* bantu/readme-documentation-section:
  Add "Documentation" section to README. Add link to Sami.
2014-08-01 18:09:14 +02:00
terrafrost
8d82f92d18 Unit tests: changing the mode with runkit causes issues with static vars 2014-08-01 11:01:53 -05:00
Andreas Fischer
9bafd88174 Add "Documentation" section to README. Add link to Sami. 2014-08-01 18:00:35 +02:00
Andreas Fischer
5ea6502cec Merge pull request #438 from bantu/BigInteger-InternalTest-ClassPrefix
Add missing Unit prefix to class Math_BigInteger_InternalTest.

* bantu/BigInteger-InternalTest-ClassPrefix:
  Add missing Unit prefix to class Math_BigInteger_InternalTest.
2014-07-31 11:51:13 +02:00
Andreas Fischer
2d726cf0ed Add missing Unit prefix to class Math_BigInteger_InternalTest. 2014-07-31 11:41:57 +02:00
Andreas Fischer
11c4a62af6 Merge pull request #431 from bantu/issue/430
Fix "Undefined property: Math_BigInteger::$bits" + SHA512 tests.

* bantu/issue/430:
  Add some test cases for SHA512.
  Use toBits() as there is no bits property.
2014-07-26 17:20:06 +02:00
Andreas Fischer
daca5e914f Add some test cases for SHA512. 2014-07-26 13:49:42 +02:00
Andreas Fischer
737c8a9d0f Use toBits() as there is no bits property. 2014-07-26 13:43:57 +02:00
Andreas Fischer
2ccb301c4c Merge pull request #425 from bantu/ssh-remove-none-mac
SSH2: Disallow the none MAC.

* bantu/ssh-remove-none-mac:
  SSH2: Disallow the none MAC.
2014-07-26 13:14:39 +02:00
Andreas Fischer
ee5ddb025c Merge pull request #429 from bantu/ssh-hmac-sha2-256
SSH2: Add hmac-sha2-256 MAC support

* bantu/ssh-hmac-sha2-256:
  ssh-hmac-sha2-256: Remove whitespace at end of line.
  Added RFC6668
  Add hmac-sha2-256 MAC support
2014-07-26 13:11:23 +02:00
Andreas Fischer
4be4533a6e ssh-hmac-sha2-256: Remove whitespace at end of line. 2014-07-26 13:02:52 +02:00
terrafrost
49079fa1b4 SSH2: make it so negotiated algorithms can be seen before login 2014-07-25 10:03:31 -05:00
Dag Wieers
1a330b68e2 Added RFC6668
Added the requested changed.
2014-07-25 14:10:01 +02:00
Dag Wieers
86d17c6989 Add hmac-sha2-256 MAC support
This small patch adds hmac-sha2-256 support separately as requested in #423.

Some security standards now recommend to disable MD5 and SHA1, and use SHA2 instead. This change was tested using SHA2 against RHEL6's OpenSSH v5.3p1 and Solaris 11. And was also tested with RHEL5's OpenSSH 4.3p2 which doesn't include SHA2.
2014-07-25 12:28:08 +02:00
Andreas Fischer
1aecc5e3d8 SSH2: Disallow the none MAC. 2014-07-25 12:18:11 +02:00
Andreas Fischer
880bc9d9e6 Merge pull request #420 from bantu/sftp-skip-current-dir-by-removal
SFTP: Do not check filename over and over again, remove '.' and '..' from the map instead.

* bantu/sftp-skip-current-dir-by-removal:
  Do not check filename over and over again, remove '.' and '..' from the map instead.
2014-07-24 17:32:38 +02:00
Andreas Fischer
48a2613cde Merge pull request #421 from bantu/issue/418
SFTP: Only fclose($fp) when $mode & NET_SFTP_LOCAL_FILE.

* bantu/issue/418:
  Only fclose($fp) when $mode & NET_SFTP_LOCAL_FILE.
2014-07-24 17:04:24 +02:00
Andreas Fischer
5a53823adf Merge pull request #422 from bantu/issue/419
Net_SFTP::_list() only takes two parameters.

* bantu/issue/419:
  Net_SFTP::_list() only takes two parameters.
2014-07-24 17:02:46 +02:00
Andreas Fischer
952d2166bf Net_SFTP::_list() only takes two parameters. 2014-07-24 11:09:37 +02:00
Andreas Fischer
695d1e9038 Only fclose($fp) when $mode & NET_SFTP_LOCAL_FILE. 2014-07-24 11:06:24 +02:00
Andreas Fischer
84a9a300d4 Do not check filename over and over again, remove '.' and '..' from the map instead. 2014-07-24 11:00:55 +02:00
Andreas Fischer
a0a23cbaf1 Merge pull request #406 from bantu/remove-ssh-arcfour
Remove the arcfour and none ciphers from SSH2.

* bantu/remove-ssh-arcfour:
  Comment out (potentially) insecure ciphers arcfour and none.
2014-07-22 16:09:14 +02:00
Andreas Fischer
65dcc85487 Merge pull request #415 from bantu/SSH2-isConnected-Tests
Tests for Net_SSH2::isConnected() and more

* bantu/SSH2-isConnected-Tests:
  Add a few SSH2 preLogin tests.
2014-07-22 16:08:05 +02:00
Andreas Fischer
d614274ed2 Add a few SSH2 preLogin tests. 2014-07-21 23:58:17 +02:00
Andreas Fischer
36baab1db4 Merge pull request #417 from terrafrost/ssh2-bitmap
SSH2: don't remove old $this->bitmap values

* terrafrost/ssh2-bitmap:
  SSH2: don't remove old $this->bitmap values
2014-07-21 23:53:33 +02:00
terrafrost
9dd3db4a49 SSH2: don't remove old $this->bitmap values 2014-07-21 16:41:39 -05:00
Andreas Fischer
84ac305704 Comment out (potentially) insecure ciphers arcfour and none. 2014-07-21 12:16:49 +02:00
Andreas Fischer
e0e67a602b Merge pull request #414 from bantu/SSH2-isConnected-bool
Make Net_SSH2::isConnected() return a boolean instead of int.

* bantu/SSH2-isConnected-bool:
  Make Net_SSH2::isConnected() return a boolean instead of int.
2014-07-20 23:31:29 +02:00
Andreas Fischer
678d0cc792 Make Net_SSH2::isConnected() return a boolean instead of int. 2014-07-20 23:03:06 +02:00
Andreas Fischer
cc64ef9d3f Merge pull request #412 from terrafrost/ssh2-connected
SSH2: make isConnected return true if even if we're not logged in

* terrafrost/ssh2-connected:
  SSH2: make isConnected return true if even if we're not logged in
2014-07-20 23:00:30 +02:00