c7d7b36018
SSH2: don't try to login as none auth method for CoreFTP server
2020-07-31 02:49:21 -05:00
e2fa9f3925
Revert "..."
...
This reverts commit 827607575a
2020-07-08 08:48:48 -05:00
827607575a
...
2020-07-03 13:31:37 -05:00
97ab584c63
Merge branch '2.0' into 3.0
2020-05-31 12:22:45 -05:00
ee278f3062
Merge branch 'timeout-alt-1.0' into timeout-alt-2.0
2020-05-29 08:10:36 -05:00
9651d075e3
SSH2: timeout after 5s for channel closures
2020-05-29 08:10:03 -05:00
995bf77315
SSH2: rm format_log_helper method
2020-05-12 08:35:45 -05:00
3b99d23220
Merge branch '1.0' into 2.0
2020-04-28 22:07:45 -05:00
e29f5bda14
Fix return type hint of SSH2::read()
2020-04-28 22:07:39 -05:00
ceff4cfbbc
rm call_user_func() calls
2020-04-05 15:04:22 -05:00
d37dffdb81
SSH: use an anonymous function for logging callback
2020-04-05 10:29:57 -05:00
ef04a176dd
Merge branch '2.0' into 3.0
2020-03-09 20:02:17 -05:00
b1a1fb5a08
Merge branch '2.0' into 3.0
2020-03-07 21:36:06 -06:00
21c5aa3de3
Merge branch '1.0' into 2.0
2020-03-07 21:35:34 -06:00
95d189ca72
SSH2: try logging in with none as an auth method first
2020-03-07 21:34:38 -06:00
ddd5a08c5f
SSH2: update identifier to 3.0
2020-03-07 21:19:00 -06:00
59a7b1166b
SSH2: use RFC8332 auth even if host key algo isn't RSA
2020-02-24 19:43:32 -06:00
ee10846cac
SSH2: more consistent exception handling
2020-02-24 18:16:31 -06:00
7387d79a4f
Merge branch '2.0' into 3.0
2020-02-01 22:50:28 -06:00
8a761b5265
Merge branch '1.0' into 2.0
2020-02-01 20:14:46 -06:00
c2be7e6480
return early if fread() response is bool(false)
2020-02-01 17:30:52 -06:00
d0856357ea
SSH2: don't adjust ssh-ed25519 signatures
2020-01-19 08:05:55 -06:00
6470d1c80e
SSH2: @stream_select -> stream_select
2020-01-17 06:38:54 -06:00
cb87d1885b
Merge pull request #1444 from tomsommer/patch-2
...
Remove error suppression from stream_select()
2020-01-17 06:37:44 -06:00
500e3225a8
SSH2: logging enhancements
2020-01-17 06:06:01 -06:00
81152288f8
Merge branch '1.0' into 2.0
2020-01-17 06:05:12 -06:00
3f448d0904
...
2020-01-17 05:54:42 -06:00
f1772cbf7a
...
2020-01-17 05:42:29 -06:00
0a1c10386a
...
2020-01-17 05:10:12 -06:00
b4bff90106
Merge branch '2.0' into 3.0
2020-01-17 04:09:49 -06:00
2b08c31fb7
Merge branch '1.0' into 2.0
2020-01-17 03:59:18 -06:00
88568b8020
SSH2: logging enhancements
2020-01-17 03:37:25 -06:00
40bd4192fc
Update SSH2.php
2020-01-17 09:41:45 +01:00
e2841212cb
Remove error suppression from stream_select()
...
Suppressing errors from stream_select() makes debugging timeouts extremely hard.
2020-01-10 11:58:36 +01:00
61ffe1a147
SSH2: fix rare key exchange issue
2020-01-07 00:20:47 -06:00
653dbd7f94
rename phpseclib/phpseclib to phpseclib/phpseclib3 for 3.0 branch
2019-11-21 19:38:03 -06:00
e3557220d7
SSH2: sodium_compat doesn't support memzero
2019-11-13 23:47:16 -06:00
8ad4743364
Merge branch '2.0' into 3.0
2019-11-02 12:44:34 -05:00
53dcc19441
Merge branch '1.0' into 2.0
2019-11-02 12:43:08 -05:00
a4ed6b80f3
SSH2: make window resizing behave more consistently with PuTTY
2019-11-02 12:42:34 -05:00
f36b4686c9
SSH2: fix E_NOTICE for diffie-hellman key exchange
2019-10-09 23:59:32 -05:00
bd534c9271
Merge branch '2.0' into 3.0
2019-09-28 13:05:42 -05:00
d8b8275282
Merge branch '1.0' into 2.0
2019-09-28 13:03:14 -05:00
a34a4edac5
SSH2: arcfour128 / arcfour256 was being included twice
2019-09-28 12:57:33 -05:00
ee2ac9f818
SSH2: rm code that is never called
2019-09-28 08:32:32 -05:00
72fe2540ab
readd visibility for 3.0 branch
2019-09-24 22:21:07 -05:00
52203748de
Merge branch '2.0' into 3.0
2019-09-24 22:20:39 -05:00
c00a199484
Merge branch '1.0' into 2.0
2019-09-24 22:20:26 -05:00
d26850e56f
SSH2: fix PHP4 compatability issue
2019-09-24 22:18:01 -05:00
c14557ec8b
SSH2: fix typo in exception
2019-09-18 08:26:07 -05:00
3af5d3b530
Merge branch '2.0' into 3.0
2019-09-16 20:08:58 -05:00
05ea3eafb8
#1405
2019-09-16 23:04:07 +02:00
0952908f70
Merge branch '1.0' into 2.0
2019-09-16 07:56:14 -05:00
cd21287ebc
SSH2: only do fclose($this->fsock) if doing so won't yield error
2019-09-16 07:55:47 -05:00
45d787a578
Merge pull request #1403 from terrafrost/hmac-additions
...
add new HMAC algorithms
2019-09-16 07:41:54 -05:00
6f8ba6c614
SSH2: tweaks to Exceptions
2019-09-11 07:55:29 -05:00
e52697abac
SSH2: no authentication didn't work
2019-09-11 06:36:03 -05:00
a06a166db6
SSH2: move $this->send_seq_no++
2019-09-10 23:43:09 -05:00
eab705fbb5
SSH2: typo
2019-09-10 23:41:52 -05:00
7aaf46c8ac
SSH2: make array_intersect_first static
2019-09-10 23:14:29 -05:00
2774e55ab2
SSH2: eliminate some code re-use involving key exchanges for MACs
2019-09-10 23:01:26 -05:00
69a11136ae
SSH2: ping tweaks
2019-09-10 19:52:35 -05:00
71aa8165fa
Merge branch '2.0'
2019-09-10 18:13:12 -05:00
2cf180fb47
Merge branch '1.0' into 2.0
2019-09-10 17:43:41 -05:00
fbf36728fd
SSH2 / SFTP: fix issues with ping()
2019-09-10 17:31:43 -05:00
71ced69714
SSH2: add support for EtM
2019-09-09 01:18:33 -05:00
580eb94fd3
SSH2: add umac-64 / umac-128 support
2019-09-08 11:23:29 -05:00
7d74163825
SSH2: use libsodium PHP 7.2 API
2019-09-07 20:10:15 -05:00
18681de192
update last commit for 2.0 branch
2019-09-07 19:53:19 -05:00
43dd05d4c2
Merge branch '1.0' into 2.0
2019-09-07 19:39:28 -05:00
3ad44cb3d6
SSH2: backport setPreferredAlgorithms() / getAlgorithmsNegotiated()
2019-09-07 19:20:21 -05:00
8a03e90d95
SSH2: update private key auth example
2019-09-07 17:06:51 -05:00
66efabda53
SSH2: update libsodium check
2019-08-07 23:29:33 -05:00
f04d69a3eb
Merge branch 'master' into diffie-hellman
2019-08-07 08:09:36 -05:00
1e7453b585
add a new diffie-hellman key exchange class
2019-08-06 22:10:56 -05:00
353ad158b4
Merge branch 'update-auto-channel-close-2.0' into update-auto-channel-close-master
2019-07-12 07:55:31 -05:00
9f1287e68b
SSH2: update constant for last commit
2019-07-12 07:53:49 -05:00
560e6d2fb1
Merge branch 'update-auto-channel-close-2.0' into update-auto-channel-close-master
2019-07-12 07:39:59 -05:00
d25a3a9248
Merge branch 'update-auto-channel-close-1.0' into update-auto-channel-close-2.0
2019-07-12 07:38:47 -05:00
9015d987f7
only auto close the channel for exec() timeouts
2019-07-12 07:38:08 -05:00
5573187f3d
rm $type parameter from AsymmetricKey::load and add loadFormat()
2019-06-28 08:51:12 -05:00
289ae55f9f
rename ECDSA -> EC
2019-06-27 23:15:25 -05:00
7012e72488
mv Keys/ and Signature/ to Formats/*
2019-06-25 07:52:45 -05:00
8e0651308c
SSH2: _close_channel -> close_channel
2019-06-12 22:08:48 -05:00
988d37e479
Merge branch '2.0'
2019-06-12 22:07:49 -05:00
491758f1c0
Merge branch '1.0' into 2.0
2019-06-12 22:07:27 -05:00
732bda2860
SSH2: close channel when a timeout occurs
2019-06-12 22:06:48 -05:00
5b89ff4177
Merge branch 'rsa-pss'
2019-06-01 16:07:48 -05:00
b226c3d882
add second $options parameter to toString method for public keys
2019-06-01 15:53:35 -05:00
93c0880ca8
SSH2: make $timeout protected
2019-05-28 08:50:03 -05:00
85e2bd4811
SSH2: get binary output from OpenSSH key handler
2019-05-21 09:10:18 -05:00
cc32cd2e95
make RSA / DSA / ECDSA immutable and add support to SSH2 / X509
2019-05-19 15:35:29 -05:00
227d9c45ef
Merge branch '2.0'
2019-04-11 21:56:27 -05:00
0ac880fca0
Merge branch '1.0' into 2.0
2019-04-11 21:56:17 -05:00
756b247446
SSH2: explain NET_SSH2_READ_NEXT in comments
2019-04-11 21:54:37 -05:00
0001b81950
SSH2: use Strings::packSSH2() / Strings::unpackSSH2()
2019-04-02 00:09:19 -05:00
f2226184ee
rm Common/Functions/Objects.php
2019-03-31 16:28:21 -05:00
d329814f55
SSH2: send_binary_packet() now always throws exceptions on error
2019-03-31 00:33:57 -05:00
1780bee619
SSH2: add support for elliptic curve hostkeys
2019-03-30 13:35:16 -05:00
72209ffd65
add setPreferredAlgorithms() and getServerAlgorithms()
2019-03-29 18:44:31 -05:00
0cff98b19e
SSH2: make it so preferred algorithm depends on available engines
2019-03-28 22:15:04 -05:00
e629271f7d
SSH2: add getMethodsNegotiated() method
2019-03-28 18:53:26 -05:00
aa4c6e686a
Merge branch 'master' into chacha20
2019-03-26 08:36:07 -05:00
16abd15089
SSH2: micro-optimization for AES-GCM
2019-03-23 21:41:52 -05:00
70f5eb4bf7
SSH2: Rijndael -> AES (for consistency)
2019-03-23 20:53:20 -05:00
539fc1a9b0
SSH2: CS adjustments
2019-03-23 19:20:06 -05:00
7d41903846
Merge branch '2.0'
2019-03-23 19:18:31 -05:00
b9f7f0c021
Merge branch '1.0' into 2.0
2019-03-23 18:43:04 -05:00
f111bf94b6
SSH2: fix issue with reconnecting via ping()
2019-03-23 18:42:40 -05:00
494d20efc8
add Salsa20 / ChaCha20 stream ciphers
2019-03-22 15:45:36 -05:00
0f87a0e026
SSH2: CS adjustment
2019-01-20 09:39:12 -06:00
c03753e3c7
Merge branch '2.0'
2019-01-20 09:17:57 -06:00
004a71ce19
Merge branch '1.0' into 2.0
2019-01-20 09:15:53 -06:00
e5ff894d4b
SSH2: add missing constant
2019-01-20 09:12:43 -06:00
ea3c8dbd9a
Merge branch '2.0'
2019-01-16 21:17:18 -06:00
f8ff1aa27f
Merge branch '1.0' into 2.0
2019-01-16 21:16:17 -06:00
b0d63fbfb5
SSH2: ssh-rsa is sometimes incorrectly used instead of rsa-sha2-256
2019-01-16 21:15:11 -06:00
3f6eb2012a
Merge branch '2.0'
2019-01-15 23:50:33 -06:00
31fbdb96e0
Merge branch '1.0' into 2.0
2019-01-15 23:48:54 -06:00
055d6097af
SSH2: more strictly adhere to RFC8332 for rsa-sha2-256/512
2019-01-15 23:41:49 -06:00
835b1207fa
SSH2: replace "$this->object !== false" with "$this->object"
2018-12-31 14:14:43 -06:00
17e6938fba
updates to Exceptions
2018-12-31 09:55:32 -06:00
97d41fd3aa
SSH2: make bad_algorithm_candidate method static
2018-12-29 20:54:18 -06:00
01c92a59f8
add support for Galois/Counter Mode (GCM)
2018-12-27 08:31:35 -06:00
b76a67dfb4
Merge branch '2.0'
2018-12-16 11:45:37 -06:00
42603ce3f4
Merge branch '1.0' into 2.0
2018-12-16 11:45:25 -06:00
a9c0e2d430
SSH2: setTimeout(0) didn't work as intended
2018-12-16 11:44:58 -06:00
669ba5224f
SSH2: rm debug code
2018-11-23 00:50:56 -06:00
e006f5b326
Merge branch '2.0'
2018-11-22 21:55:51 -06:00
396b9f1a0a
fix order of user_error() and bitmap reset
2018-11-11 16:04:30 +01:00
ca695f5bdd
fix order of user_error() and bitmap reset
2018-11-09 16:36:50 +01:00
edc51aac63
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2018-10-06 14:17:30 -05:00
8705f4b31e
SSH2: update ping method to work with exceptions
2018-10-06 11:41:15 -05:00
c1493a8063
Merge branch '2.0'
2018-10-06 08:02:59 -05:00
0a379a5386
Merge branch '1.0' into 2.0
2018-10-06 01:19:33 -05:00
25c930cc40
SSH2: add ping() method
2018-10-06 01:19:14 -05:00
422533c978
Merge branch '2.0'
2018-10-05 23:01:03 -05:00
c88abcb777
Merge branch '1.0' into 2.0
2018-10-05 22:49:24 -05:00
0c26415f93
SSH2: reset $this->bitmap when the connection fails
2018-10-05 21:27:59 -05:00
bee5fd70d8
Fix invalid method name + usages in comments
2018-09-10 17:20:48 +02:00
f381b1feb1
Merge branch '1.0' into 2.0
2018-09-08 14:42:17 -05:00
f48d85ced9
SSH2: setEngine -> setPreferredEngine
2018-09-08 14:41:28 -05:00
086afadf1b
Merge branch '2.0'
2018-08-20 21:42:00 -05:00
6189452f1b
Merge branch '1.0' into 2.0
2018-08-20 21:41:18 -05:00
bee6183bd7
SSH2: remove utf8_decode calls
2018-08-20 20:50:07 -05:00
d598204874
Fix return type for Read()
2018-07-22 14:17:15 +03:00
ffb21d7622
SSH/Agent: fix bad merge
2018-05-27 11:27:19 -05:00
03f9a4dc7e
Merge branch '2.0'
2018-05-27 10:54:36 -05:00
04f62f9e9c
SSH2: adjustments for 2.0 branch
2018-05-27 10:48:03 -05:00
0b2eb54a29
Merge branch '2.0'
2018-05-27 09:55:45 -05:00
2113ffb72c
Merge branch '1.0' into 2.0
2018-05-27 09:52:52 -05:00
b57976ec5f
SSH2: add support for rsa-sha2-256 / rsa-sha2-512 (RFC8332)
2018-05-27 09:48:44 -05:00
8da15ab19b
Merge branch '2.0'
2018-05-19 07:48:42 -05:00
bf71150433
Merge branch '1.0' into 2.0
2018-05-19 07:48:33 -05:00
9b49d3c590
SSH2: fixes relating to delayed global requests
2018-05-19 07:45:44 -05:00
380517ef00
Misc. trivial typos
...
Found via `codespell -q 3`
2018-03-03 07:07:14 -05:00
3c96ca9fd1
Merge branch '2.0-channel-request-updates' into master-channel-request-updates
2017-12-25 19:12:57 -06:00
2a09816088
Merge branch '1.0-channel-request-updates' into 2.0-channel-request-updates
2017-12-25 19:11:13 -06:00
46b5bd413a
SSH2: more channel handling updates
2017-12-25 19:09:20 -06:00
56a644faa8
replace user_error with exceptions in a few more places
2017-12-23 14:32:22 -06:00
239a32ff06
Merge pull request #1222 from rrran/extract_func_phpdoc
...
Add PhpDoc @var for extract() functions
2017-12-23 14:18:28 -06:00
62ee1a5747
Multiline phpdoc for extract to one liner
2017-12-21 10:14:53 +01:00
c705e7d9c6
Add PhpDoc @var for extract() functions
2017-12-04 11:11:43 +01:00
966ee7f170
Long array() to short [] syntax
2017-11-27 09:30:14 +01:00
2314b638c7
Merge pull request #1212 from rrran/func_get_args_to_tripple_dots
...
Get rid of func_get_args()
2017-11-23 10:02:59 -06:00
e2e719ee29
Merge branch '2.0'
2017-11-23 09:37:26 -06:00
6e9ece958b
Merge branch '1.0' into 2.0
2017-11-23 09:33:35 -06:00
309fa0af44
SSH/SFTP: more adustments to channel handling
2017-11-23 09:31:34 -06:00
ee8f5e9769
Get rid of func_get_args()
2017-11-21 09:36:28 +01:00
3065d24b0d
$this->_string_shift -> Strings::shift
2017-11-13 09:27:11 -06:00
e91da39098
Merge branch '2.0'
2017-11-11 23:16:23 -06:00
6a65ea28ec
Merge branch '1.0' into 2.0
2017-11-11 23:15:00 -06:00
b50dde76f5
SSH2: update channel handling in a few more places
2017-11-11 23:08:08 -06:00
c66b31e698
Merge branch '2.0'
2017-11-11 16:13:48 -06:00
1f7e03b43d
Merge branch '1.0-multi-channel-adjustment' into 2.0
2017-11-11 16:00:05 -06:00
0afde6ea43
SSH2: updates to dealing with extraneous channel packets
2017-11-11 15:14:04 -06:00
ec579bd9ed
revisions to rrran's PHPDoc changes
2017-11-05 14:35:27 -06:00
f40ea062c2
Lots of PHPDoc fixes
2017-10-25 11:44:14 +02:00
4f2ece4d7d
Merge remote-tracking branch 'rrran/Bugfixes2'
2017-09-30 22:50:06 +01:00
fc6a97083c
Merge branch '2.0'
2017-09-29 21:34:51 +01:00
b3add4491d
Replace extension_loaded with forward compatible function exists check
2017-09-29 21:33:57 +01:00
4f399d5c33
Merge remote-tracking branch 'origin/master' into Bugfixes2
2017-09-11 11:13:03 +02:00
1fafe157d6
SSH2: fix bad merge
2017-09-06 00:44:38 -05:00
e50d8ea51c
Merge branch '1.0' into ssh2-fix-multi-channel-1.0
2017-09-06 00:30:11 -05:00
ac19043c8b
Merge branch 'ssh2-fix-multi-channel-2.0' into ssh2-fix-multi-channel-master
2017-09-05 23:42:05 -05:00
eeaef39827
Merge branch 'ssh2-fix-multi-channel-1.0' into 2.0
2017-09-05 23:22:09 -05:00
ee3fd38682
SSH2: fix typo in comment found by Iewa
2017-08-29 07:42:51 -05:00
a3325d102e
SSH2: don't choke when getting response from diff channel in exec()
2017-08-29 00:17:48 -05:00
ae210871e3
Merge branch '2.0'
2017-08-28 22:45:18 -05:00
e669624ef5
Merge branch '1.0' into 2.0
2017-08-28 22:45:09 -05:00
c7e67721a2
SSH2: CS adjustment
2017-08-28 22:44:58 -05:00
ee5172ece5
Merge branch 'arcfour256-fix-2.0'
2017-08-27 12:33:19 -05:00
c4be683936
Merge branch 'arcfour256-fix-1.0' into 2.0
2017-08-27 02:43:31 -05:00
e5b4eef91f
SSH2: workaround for bad arcfour256 implementations
2017-08-26 20:17:59 -05:00
b27655a262
Merge branch '2.0'
2017-08-24 23:56:08 -05:00
4202f653ef
Merge branch '1.0' into 2.0
2017-08-24 23:55:27 -05:00
9cbfd23cb6
SSH2: assume any SSH server >= 1.99 supports SSH2
2017-08-24 23:52:27 -05:00
25c1ae6e00
Merge remote-tracking branch 'origin/master' into Bugfixes2
2017-08-09 12:28:02 +02:00
3fcce89f78
Merge remote-tracking branch 'rrran/Bugfixes'
2017-08-07 21:47:06 -05:00
93a3139475
Merge branch 'pre-1157-changes'
2017-08-07 21:46:28 -05:00
520c56a797
Merge branch 'send-kex-and-id-first-or-last-2.0'
2017-08-07 20:09:26 -05:00
dfb6770891
Merge branch 'send-kex-and-id-first-or-last-1.0' into 2.0
2017-08-07 18:37:11 -05:00
7ccb0d0b02
SSH2: send KEXINIT packet and identification string first or last
2017-08-07 00:34:58 -05:00
9f540a82e6
minor fixes to X509 and SSH2
2017-08-06 17:29:30 -05:00
55cacdf7cd
More PHPDOC fixes
2017-08-04 12:06:25 +02:00
0fd58aeb7e
Set of PHPDOC fixes
...
Fixed methods visibility
2017-08-03 09:19:11 +02:00
4171262b9e
SymmetricKey: use strings for constructor and setPreferredEngine
2017-06-28 06:54:10 -05:00
0bbac3ebed
Merge branch '2.0'
2017-06-19 22:37:21 -05:00
3cbb9516ef
Merge branch '1.0' into 2.0
2017-06-19 22:35:22 -05:00
b6eb7b2009
Merge branch '2.0'
2017-06-19 22:34:28 -05:00
9814140055
Merge branch '1.0' into 2.0
2017-06-19 22:34:20 -05:00
7606f81279
Add new mode READ_NEXT to only ready the next packet from the channel.
2017-06-19 22:33:08 -05:00
8ea3edf0d2
Merge branch '2.0'
2017-06-12 22:37:06 -05:00
9d0c924cbd
Merge branch '1.0' into 2.0
2017-06-12 22:36:58 -05:00
4d36e67bee
Fix Invalid HMAC for D-link DES-3028
...
When I tried connect to a dlink switch the Net_SSH2 does not choose
the correct algorithms for hmac causing an Invalid HMAC error. However,
after I commented the line 1280 everything work magnificently
2017-06-12 22:36:30 -05:00
a312a1d4f0
SSH2: update a few function calls to work with renamed methods
2017-05-28 09:44:38 -05:00
9cbf357ac5
Merge branch '2.0'
2017-03-01 22:27:31 -06:00
ecb92ad25c
Merge branch '1.0' into 2.0
2017-03-01 22:27:00 -06:00
8abc0ee60c
SSH2: include <pre> tags in getLog result when SAPI isn't CLI
2017-03-01 22:26:29 -06:00
9f4f288005
Merge branch '1.0' into 2.0
2017-03-01 22:24:59 -06:00
b8ceb96bd4
SSH2: include <pre> tags in getLog result when SAPI isn't CLI
2017-03-01 22:18:38 -06:00
a25c841108
Merge remote-tracking branch 'upstream/master' into php5-updates
2017-01-17 22:40:24 -06:00
b9b4f67a0f
Net: add public / private / protected
2017-01-17 10:23:28 -06:00
c8c61055d1
Merge branch '2.0'
2016-12-24 21:34:30 -06:00
95335f9560
SSH2: update PTY changes for 2.0 branch
2016-12-24 21:20:13 -06:00
6aa31b2cd1
Merge branch '1.0' into 2.0
2016-12-24 21:10:50 -06:00
785b477605
Merge branch 'pty-enhancement' into 1.0
2016-12-24 20:28:19 -06:00
2a7c99ef1b
...
2016-12-17 17:22:11 -06:00
a72a168400
Merge branch '1.0' into 2.0
2016-12-17 17:03:08 -06:00
d80794b1d9
exec authentication, code reuse
2016-12-17 16:37:04 -06:00
b26f14e5fe
SSH2: make it so disabling PTY closes exec() channel if it's open
2016-12-17 16:09:48 -06:00
2a1177b256
SymmetricCiphers: add public / private / protected as appropriate
2016-12-07 22:19:20 -06:00
c852bae3c8
use short array syntax for arrays
2016-11-30 21:29:38 -06:00
72a6aab872
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2016-11-29 23:18:44 -06:00
e34e5f5135
Merge branch '2.0'
2016-11-29 23:00:03 -06:00
024ac81d04
Merge branch '1.0' into 2.0
2016-11-29 19:26:11 -06:00
d0cb855bbc
Merge branch '1.0-suppress-unpack-errors' into 1.0
2016-11-29 19:16:16 -06:00
81bae5ce8b
Merge pull request #1061 from terrafrost/pkcs18-rewrite
...
RSA: refactor PKCS1/PKCS8 to facilitate re-use
2016-11-29 19:15:21 -06:00
6807791d42
Merge branch '2.0'
2016-11-20 11:14:48 -06:00
abf3899e1f
Merge branch '1.0' into 2.0
2016-11-20 11:14:35 -06:00
7cb66ea56e
SSH2: don't use timeout value of 0 for fsockopen
2016-11-20 11:08:53 -06:00
48cf16599b
suppress unpack() PHP warnings
2016-11-19 22:39:36 -06:00
272ae9c64c
Merge branch 'master' into pkcs18-rewrite
2016-11-17 08:10:55 -06:00
863ff6789b
RSA: refactor PKCS1/PKCS8 to facilitate re-use
2016-11-17 08:09:10 -06:00
2d2bf2990e
Merge branch '2.0'
2016-11-08 09:23:53 -06:00
a47eccf6f9
Merge branch '1.0' into 2.0
2016-11-08 09:22:05 -06:00
535104cb84
SSH2: send the identifier first, before reading it
2016-11-08 09:11:57 -06:00
8019baee62
BigInteger: add randomRange / randomPrimeRange
...
...and redo random / randomPrime such that they take the byte size
as the parameter instead of the range.
2016-09-17 19:48:51 -07:00
c17a2604a0
Merge branch 'master-reorg'
2016-09-17 09:15:11 -07:00
845135f887
add PHP5-style constructors along side PHP4-style ones
2016-09-10 10:41:05 -07:00
terrafrost
Simon Podlipsky
terrafrost
Tom Sommer
Jamiel
Sebastiaan Andeweg
Jakub Chábek
luz.paz
Sokolovskyy Roman
Martijn Smit
Moritz Kornher
Sidney Souza
vladimirghetau