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
69edbc9794
Merge branch 'master' into php5
...
* master:
Add "Documentation" section to README. Add link to Sami.
Conflicts:
README.md
2014-08-01 18:10:30 +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
4594bbb0dc
Merge branch 'master' into php5
...
* master:
Add missing Unit prefix to class Math_BigInteger_InternalTest.
2014-07-31 11:51:36 +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
e4516fb453
Merge branch 'master' into php5
...
* master:
Add some test cases for SHA512.
Use toBits() as there is no bits property.
SSH2: Disallow the none MAC.
2014-07-26 17:20:09 +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
fed60fe8ac
Merge branch 'master' into php5
...
* master:
ssh-hmac-sha2-256: Remove whitespace at end of line.
Added RFC6668
Add hmac-sha2-256 MAC support
2014-07-26 13:11:29 +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
bb1c36893f
Merge branch 'master' into php5
...
* master:
Do not check filename over and over again, remove '.' and '..' from the map instead.
2014-07-24 17:32:38 +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
8862b3c97a
Merge branch 'master' into php5
...
* master:
Only fclose($fp) when $mode & NET_SFTP_LOCAL_FILE.
2014-07-24 17:04:25 +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
47695777f8
Merge branch 'master' into php5
...
* master:
Net_SFTP::_list() only takes two parameters.
2014-07-24 17:02:47 +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
f0d0158c2b
Merge branch 'master' into php5
...
* master:
Comment out (potentially) insecure ciphers arcfour and none.
2014-07-22 16:09:16 +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
9fadfcc1ad
Merge branch 'master' into php5
...
* master:
Add a few SSH2 preLogin tests.
2014-07-22 16:08:06 +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
ae913d64c3
Merge branch 'master' into php5
...
* master:
SSH2: don't remove old $this->bitmap values
2014-07-21 23:53:34 +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
025a637053
Merge branch 'master' into php5
...
* master:
Make Net_SSH2::isConnected() return a boolean instead of int.
2014-07-20 23:31:30 +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
c2f2f4a764
Merge branch 'master' into php5
...
* master:
SSH2: make isConnected return true if even if we're not logged in
2014-07-20 23:00:32 +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
Andreas Fischer
e191ba32ea
Merge branch 'master' into php5
...
* master:
Put some assertions into testStatcacheFix().
2014-07-20 22:44:42 +02:00
Andreas Fischer
884c090bf2
Merge pull request #413 from bantu/stat-cache-fix
...
Put some assertions into testStatcacheFix().
* bantu/stat-cache-fix:
Put some assertions into testStatcacheFix().
2014-07-20 22:44:40 +02:00
Andreas Fischer
d29ad3afa9
Merge branch 'master' into php5
...
* master:
SFTP: stat cache fixes
SFTP: return $sftp object in new unit test method
SFTP: add unit test for stat cache fix
2014-07-20 21:41:51 +02:00
Andreas Fischer
302f4f894b
Merge pull request #409 from terrafrost/stat-cache-fix
...
SFTP: add unit test for stat cache fix
* terrafrost/stat-cache-fix:
SFTP: stat cache fixes
SFTP: return $sftp object in new unit test method
SFTP: add unit test for stat cache fix
2014-07-20 21:41:50 +02:00
Andreas Fischer
01a176b3d3
Merge branch 'master' into php5
...
* master:
Add api target to phing build script.
Add sami configuration file.
Add sami/sami 1.* as a development dependency.
Conflicts:
composer.lock
2014-07-20 21:22:19 +02:00