Commit Graph

1991 Commits

Author SHA1 Message Date
terrafrost
d6819a55b0 Merge branch '1.0' into 2.0 2019-06-23 11:33:11 -05:00
terrafrost
9e27b4305e BigInteger: !count -> count 2019-06-23 11:32:46 -05:00
terrafrost
bad47d9b00 Merge branch '1.0' into 2.0 2019-06-23 11:13:09 -05:00
terrafrost
4af1bb4c17 BigInteger: the !== [] check only works on PHP 5.4+ 2019-06-23 11:12:17 -05:00
Remi Collet
25469cb98f fix compat with 5.3 2019-06-21 09:25:24 +02:00
terrafrost
d2085db7b7 Merge branch '1.0' into 2.0 2019-06-19 22:34:11 -05:00
terrafrost
5e9d05a9f4 BigInteger: fix issues with divide method 2019-06-19 22:29:31 -05:00
terrafrost
82454229f6 Merge branch '2.0-callback' into 2.0 2019-06-16 15:31:31 -05:00
terrafrost
f8d8ad24fd Merge branch '1.0-callback' into 1.0 2019-06-16 15:31:22 -05:00
terrafrost
0932fb3054 Merge branch '1.0' into 2.0 2019-06-16 11:03:37 -05:00
Rubens Matrono
a7d038830c fix array_merge(): Argument #1 is not an array 2019-06-16 11:03:27 -05:00
terrafrost
491758f1c0 Merge branch '1.0' into 2.0 2019-06-12 22:07:27 -05:00
terrafrost
732bda2860 SSH2: close channel when a timeout occurs 2019-06-12 22:06:48 -05:00
terrafrost
52b7e4610c fix bad merge 2019-06-10 00:09:17 -05:00
terrafrost
6cf05541cc Merge branch '1.0' into 2.0 2019-06-09 23:46:46 -05:00
terrafrost
cd7de5723c RSA: add support for OpenSSH private keys 2019-06-09 23:42:41 -05:00
terrafrost
a0fa38db6d Merge branch '1.0-callback' into 2.0-callback 2019-06-02 08:20:07 -05:00
terrafrost
e988abcdb1 SFTP: add callback parameter to get() 2019-06-02 08:19:41 -05:00
terrafrost
06ccf5d1f9 Merge branch '1.0' into 2.0 2019-05-28 08:47:51 -05:00
terrafrost
8df35cc368 SFTP: improve handling of malformed packets 2019-05-28 08:47:34 -05:00
terrafrost
3ca5b88d58 Merge branch '1.0' into 2.0 2019-05-26 15:38:34 -05:00
terrafrost
677ae387b0 BigInteger: backport GMP fixes from master branch 2019-05-26 15:38:18 -05:00
terrafrost
fae6542efc Merge branch '1.0' into 2.0 2019-05-26 12:17:27 -05:00
terrafrost
8b76e96b83 BigInteger: GMP engine didn't always return 1 or -1 2019-05-26 12:14:44 -05:00
terrafrost
77ffe153a0 Merge branch '1.0' into 2.0 2019-05-26 11:42:01 -05:00
terrafrost
9c67616f1e BigInteger: new BigInteger('00') caused issues with GMP 2019-05-26 11:41:42 -05:00
terrafrost
7d4b724749 Merge branch '1.0' into 2.0 2019-05-26 10:28:50 -05:00
terrafrost
70c0a0ddf4 ASN1: correctly handle long tags 2019-05-26 03:18:06 -05:00
terrafrost
98cbccc81a Merge branch 'oid-revamp' into oid-revamp-2.0 2019-05-02 07:18:37 -05:00
terrafrost
e793461543 ASN1: revamp how OIDs are handled 2019-05-01 09:17:53 -05:00
terrafrost
0ac880fca0 Merge branch '1.0' into 2.0 2019-04-11 21:56:17 -05:00
terrafrost
756b247446 SSH2: explain NET_SSH2_READ_NEXT in comments 2019-04-11 21:54:37 -05:00
terrafrost
337d115179 Merge branch '1.0' into 2.0 2019-03-23 20:17:59 -05:00
terrafrost
b5b763b3f2 RSA: use hash_equals if available 2019-03-23 20:17:43 -05:00
terrafrost
b9f7f0c021 Merge branch '1.0' into 2.0 2019-03-23 18:43:04 -05:00
terrafrost
f111bf94b6 SSH2: fix issue with reconnecting via ping() 2019-03-23 18:42:40 -05:00
terrafrost
529fcae7f6 Merge branch '1.0' into 2.0 2019-03-09 18:42:54 -06:00
Ulugbek Miniyarov
7c894b2b99 Fix x509 OpenSSL format when multiple OU's are present
When formatting DN in OpenSSL format Multiple Organizational Unit Names (OU) in certificates throw `PHP Notice:  Undefined index: id-at-organizationalUnitName` and returned array only contains the last OU.
2019-03-09 18:42:42 -06:00
terrafrost
307f685cbc Merge branch '1.0' into 2.0 2019-03-09 17:20:49 -06:00
terrafrost
84e2329249 Hash: fix issues with the mode 2019-03-09 17:08:59 -06:00
terrafrost
e706c549c1 Hash: adjustments for 2.0 branch 2019-03-08 08:36:16 -06:00
terrafrost
07ffe647f7 Merge branch '1.0' into 2.0 2019-03-08 08:34:58 -06:00
terrafrost
492562e034 Hash: fix issues with _computeKey 2019-03-08 08:34:33 -06:00
terrafrost
0bb37d2853 Merge branch '1.0' into 2.0 2019-03-08 07:30:33 -06:00
terrafrost
ca76d3913f RSA: protect against possible timing attacks during OAEP decryption 2019-03-08 07:27:04 -06:00
terrafrost
ed975a270d Merge branch '1.0' into 2.0 2019-03-04 08:15:45 -06:00
Zachery Stuart
a276c2b073 Call xml_parser_free and unset to avoid memory leaks 2019-03-04 08:15:08 -06:00
terrafrost
03d9efcbc9 Merge branch '1.0' into 2.0 2019-03-03 18:40:36 -06:00
terrafrost
fce6063de6 SFTP: make it so get() can correctly handle out of order responses 2019-03-03 18:38:57 -06:00
Bob van de Vijver
48b1c87f4c
Fixed RSA loadKey type hint 2019-02-22 10:37:16 +01:00
terrafrost
86b05c0081 Merge branch '1.0' into 2.0 2019-02-10 17:20:21 -06:00
terrafrost
fcfba38fc7 Crypt: avoid bogus IV errors in ECB mode 2019-02-10 17:18:40 -06:00
terrafrost
9902edfac3 Merge branch '1.0' into 2.0 2019-02-05 23:31:04 -06:00
Alex Bouma
9a0a9a0096 Whitelist OID 1.3.6.1.4.1.11129.2.4.2
This OID is used in some intermediate certificates from the Dutch government and allows for parsing and saving/validating these certificates with phpseclib.
2019-02-05 23:30:55 -06:00
terrafrost
0926c4286e Merge branch '1.0' into 2.0 2019-01-27 17:04:12 -06:00
terrafrost
5b795c18ab SCP: issue error if remote_file is empty in put() call 2019-01-27 17:03:53 -06:00
terrafrost
0f87a0e026 SSH2: CS adjustment 2019-01-20 09:39:12 -06:00
terrafrost
004a71ce19 Merge branch '1.0' into 2.0 2019-01-20 09:15:53 -06:00
terrafrost
e5ff894d4b SSH2: add missing constant 2019-01-20 09:12:43 -06:00
terrafrost
f8ff1aa27f Merge branch '1.0' into 2.0 2019-01-16 21:16:17 -06:00
terrafrost
b0d63fbfb5 SSH2: ssh-rsa is sometimes incorrectly used instead of rsa-sha2-256 2019-01-16 21:15:11 -06:00
terrafrost
31fbdb96e0 Merge branch '1.0' into 2.0 2019-01-15 23:48:54 -06:00
terrafrost
055d6097af SSH2: more strictly adhere to RFC8332 for rsa-sha2-256/512 2019-01-15 23:41:49 -06:00
terrafrost
42603ce3f4 Merge branch '1.0' into 2.0 2018-12-16 11:45:25 -06:00
terrafrost
a9c0e2d430 SSH2: setTimeout(0) didn't work as intended 2018-12-16 11:44:58 -06:00
terrafrost
6b6c869bb8 Merge branch '1.0' into 2.0 2018-12-01 23:14:10 -06:00
terrafrost
363ffc9cfd System/SSH/Agent: CS adjustment 2018-12-01 23:10:54 -06:00
terrafrost
1bb2826ab1 Merge branch '1.0' into 2.0 2018-12-01 22:46:13 -06:00
terrafrost
fbef6f009f System/SSH/Agent: add parameter to constructor 2018-12-01 22:41:45 -06:00
terrafrost
f3ea7ae986 Merge branch '1.0' into 2.0 2018-11-22 21:19:33 -06:00
terrafrost
8f2a0e6f0d System/SSH/Agent: add support for rsa-sha2-256 / rsa-sha2-512 2018-11-22 20:47:15 -06:00
terrafrost
476cb127b1 X509: fix errors with validateDate 2018-11-22 13:28:42 -06:00
Sebastiaan Andeweg
396b9f1a0a fix order of user_error() and bitmap reset 2018-11-11 16:04:30 +01:00
Sebastiaan Andeweg
ca695f5bdd fix order of user_error() and bitmap reset 2018-11-09 16:36:50 +01:00
terrafrost
99dcf43a7a Merge branch '1.0' into 2.0 2018-10-13 08:21:22 -05:00
terrafrost
048635669e Crypt/Base: create hmac object outside of while loop 2018-10-13 08:20:09 -05:00
terrafrost
f0f7350045 Crypt/Base: if derived key length is 0 or less use hash length 2018-10-13 08:10:34 -05:00
terrafrost
f938922cfc Merge branch '1.0' into 2.0 2018-10-12 23:05:42 -05:00
terrafrost
2d7aadc689 Hash: tweaks to hash pre-computation 2018-10-12 23:04:57 -05:00
terrafrost
f5a9c0806a Merge branch '1.0' into 2.0 2018-10-12 21:44:52 -05:00
terrafrost
685e0abcc6 Hash: save hashed keys for re-use 2018-10-12 21:18:23 -05:00
terrafrost
3e41dc7c07 Merge branch '1.0' into 2.0 2018-10-08 07:35:56 -05:00
terrafrost
f2d92cd4b2 BigInteger: rm pear.php.net link 2018-10-08 07:35:36 -05:00
terrafrost
0a379a5386 Merge branch '1.0' into 2.0 2018-10-06 01:19:33 -05:00
terrafrost
25c930cc40 SSH2: add ping() method 2018-10-06 01:19:14 -05:00
terrafrost
c88abcb777 Merge branch '1.0' into 2.0 2018-10-05 22:49:24 -05:00
terrafrost
0c26415f93 SSH2: reset $this->bitmap when the connection fails 2018-10-05 21:27:59 -05:00
terrafrost
48aa55b7f6 Merge branch '1.0' into 2.0 2018-09-17 00:27:25 -05:00
Michiel Brandenburg
b4e66d343e Fixes #1296 parsing invalid certificate 2018-09-17 00:25:55 -05:00
terrafrost
f381b1feb1 Merge branch '1.0' into 2.0 2018-09-08 14:42:17 -05:00
terrafrost
f48d85ced9 SSH2: setEngine -> setPreferredEngine 2018-09-08 14:41:28 -05:00
terrafrost
6189452f1b Merge branch '1.0' into 2.0 2018-08-20 21:41:18 -05:00
terrafrost
bee6183bd7 SSH2: remove utf8_decode calls 2018-08-20 20:50:07 -05:00
terrafrost
82967a40d4 Merge branch '1.0-dsas' into 2.0 2018-08-18 15:03:25 -05:00
terrafrost
f7f156b537 SFTP: use lstat in rawlist instead of stat 2018-08-18 15:02:42 -05:00
Dean Sas
426dbdbfcd Ensure SFTP::rawlist gives same results regardless of statcache
Previously SFTP::rawlist gave different results depending on whether the
stat cache was enabled or not. With the stat cache turned off it did not
treat directories correctly, as it relied on the stat cache even though
it was not populated.
2018-08-18 08:36:16 -05:00
terrafrost
49e0b860de Merge branch '1.0' into 2.0 2018-07-16 00:56:57 -05:00
terrafrost
66f6d517da X509: teak validateDate 2018-07-16 00:54:16 -05:00
terrafrost
6b275cdcd5 SSH/Agent: CS adjustment 2018-05-27 11:33:37 -05:00
terrafrost
04f62f9e9c SSH2: adjustments for 2.0 branch 2018-05-27 10:48:03 -05:00
terrafrost
b8bb23c9f1 Merge branch '1.0' into 2.0 2018-05-27 10:44:17 -05:00
terrafrost
39a0b652b3 SSH/Agent: add dummy setHash() method 2018-05-27 10:29:56 -05:00
terrafrost
2113ffb72c Merge branch '1.0' into 2.0 2018-05-27 09:52:52 -05:00
terrafrost
b57976ec5f SSH2: add support for rsa-sha2-256 / rsa-sha2-512 (RFC8332) 2018-05-27 09:48:44 -05:00
terrafrost
bf71150433 Merge branch '1.0' into 2.0 2018-05-19 07:48:33 -05:00
terrafrost
9b49d3c590 SSH2: fixes relating to delayed global requests 2018-05-19 07:45:44 -05:00
Bilge
8c299f865f
Fixed some RSA docblock types. 2018-04-25 21:18:51 +01:00
terrafrost
bbc651f0b6 Merge branch '1.0' into 2.0 2018-04-15 10:27:46 -05:00
terrafrost
6bfca3df72 X509: CS adjustment 2018-04-14 23:41:00 -05:00
terrafrost
6dc7b3e6b9 ASN1: class is never set as key in _decode_ber 2018-04-14 23:39:05 -05:00
terrafrost
4548b45b9e Merge branch '1.0' into 2.0 2018-04-09 23:57:25 -05:00
terrafrost
c63c223972 BigInteger: fix for (new BigInteger(48))->toString(true) 2018-04-09 23:47:38 -05:00
terrafrost
3dae376e9c Merge remote-tracking branch 'J5lx/2.0-cfb8' into 2.0 2018-03-27 11:06:11 -05:00
Jakob Gahde
8e6948fdd2
Backport CFB8 support from master 2018-03-27 04:32:16 +02:00
Wes
d4a98457bc Check phpinfo() is available before using
Fixes an issue I raised at https://github.com/phpseclib/phpseclib/issues/1255

Proof of logic at https://3v4l.org/RqrHt

I ended up moving more code than discussed in the issue - initially to avoid `$content` being undefined when it came to `preg_match_all()`, but also as it made sense grouping the code that way. Also, initialising `$versions` outside the check, right at the start ensures it's always defined for the `switch` code further down.
2018-03-24 11:05:16 +00:00
terrafrost
fc90c58f7f X509: update disable/enableURLFetch to work with 2.0 branch 2018-03-03 13:44:11 -06:00
terrafrost
e3a1e47824 Merge branch '1.0' into 2.0 2018-03-03 13:42:46 -06:00
terrafrost
ea47574317 X509: add methods to enable / disable URL fetching 2018-03-03 13:42:17 -06:00
terrafrost
40730d2977 X509: update intermediate cert changes to work on 2.0 branch 2018-03-03 07:46:03 -06:00
terrafrost
87decbe94b Merge branch 'authority-info-access-1.0' into authority-info-access-2.0 2018-03-03 00:15:29 -06:00
terrafrost
f5807e1d4e X509: auto download intermediate certs 2018-03-02 12:53:15 -06:00
terrafrost
473c980d0c Merge branch '1.0' into 2.0 2018-02-07 21:23:21 -06:00
terrafrost
1468ef1a23 SFTP: fix issue with extended attribute on 64-bit PHP installs 2018-02-07 21:22:54 -06:00
terrafrost
364e05babf Merge branch '1.0' into 2.0 2018-01-22 07:22:29 -06:00
terrafrost
92623daba8 BigInteger: fix issues with bitwise_xor 2018-01-22 00:38:42 -06:00
terrafrost
c419f1121f Merge branch '1.0' into 2.0 2018-01-21 12:38:35 -06:00
terrafrost
8aecafc92f X509: fix 7.2 error when extensions were removed and new ones added 2018-01-21 12:36:49 -06:00
terrafrost
d0155508e9 Merge branch '1.0' into 2.0 2018-01-01 13:09:05 -06:00
terrafrost
30a11a3951 SFTP: update state cache accordingly when file becomes directory 2018-01-01 13:07:45 -06:00
terrafrost
2a09816088 Merge branch '1.0-channel-request-updates' into 2.0-channel-request-updates 2017-12-25 19:11:13 -06:00
terrafrost
46b5bd413a SSH2: more channel handling updates 2017-12-25 19:09:20 -06:00
terrafrost
c340d62548 Crypt: some of the minimum key lengths were off 2017-12-19 07:04:36 -06:00
terrafrost
4bc1d7d682 Merge branch '1.0' into 2.0 2017-12-18 00:08:00 -06:00
terrafrost
354666c36d Merge branch 'jude' into 1.0 2017-12-18 00:06:51 -06:00
terrafrost
37922e5b4c Merge branch '1.0' into 2.0 2017-12-17 15:05:15 -06:00
terrafrost
6930560ae6 more adjustments for ARM CPU's 2017-12-17 14:52:43 -06:00
terrafrost
45d6d0aa70 Merge branch 'validation-1.0' into 2.0 2017-12-14 06:34:32 -06:00
terrafrost
36e9992508 X509: serial numbers are biginteger's 2017-12-14 06:22:55 -06:00
terrafrost
446652099a Merge branch 'validation-1.0' into 2.0 2017-12-13 19:50:37 -06:00
terrafrost
247e969366 X509: simplify revised validation logic and add to CRL validation 2017-12-13 19:36:55 -06:00
mdelikat
d9195ea5bd validateSignature if subjectKeyIdentifier is not set and check serial number if is set 2017-12-13 19:05:06 -06:00
terrafrost
87dd553517 Merge branch '1.0' into 2.0 2017-12-09 18:39:27 -06:00
terrafrost
b25681beeb fix float to int conversions on ARM CPU's 2017-12-09 18:16:48 -06:00
terrafrost
2f3c9197d9 Merge branch '1.0-travis-exp' into 2.0-travis-exp 2017-12-03 22:40:31 -06:00
terrafrost
ab5158dcd3 Random: return empty string if $length is 0 2017-12-03 22:39:01 -06:00
terrafrost
1587c5498b Merge branch '1.0-travis-exp' into 2.0-travis-exp 2017-12-03 20:22:57 -06:00
terrafrost
703f7840db X509: use anonymous function in PHP >= 5.3.0 2017-12-03 15:55:58 -06:00
terrafrost
c5d0674c20 Merge branch '2.0-is-prime' into 2.0 2017-11-23 10:25:34 -06:00
terrafrost
096289882a Merge branch '1.0-is-prime' into 1.0 2017-11-23 10:25:28 -06:00
terrafrost
6e9ece958b Merge branch '1.0' into 2.0 2017-11-23 09:33:35 -06:00
terrafrost
309fa0af44 SSH/SFTP: more adustments to channel handling 2017-11-23 09:31:34 -06:00
terrafrost
cd58e3be1d Merge branch '1.0-is-prime' into 2.0-is-prime 2017-11-22 19:50:49 -06:00
terrafrost
5ba61146e6 BigInteger: adjustment to isPrime 2017-11-22 19:49:55 -06:00
terrafrost
6a65ea28ec Merge branch '1.0' into 2.0 2017-11-11 23:15:00 -06:00
terrafrost
b50dde76f5 SSH2: update channel handling in a few more places 2017-11-11 23:08:08 -06:00
terrafrost
1f7e03b43d Merge branch '1.0-multi-channel-adjustment' into 2.0 2017-11-11 16:00:05 -06:00
terrafrost
0afde6ea43 SSH2: updates to dealing with extraneous channel packets 2017-11-11 15:14:04 -06:00
Jude Rosario
3875d43cb4
Fix PHP 7 global variable rename
As described here http://php.net/manual/en/migration70.incompatible.php
2017-11-07 13:48:18 +05:30
terrafrost
d218020747 Merge branch '1.0' into 2.0 2017-11-05 11:42:08 -06:00
terrafrost
ffcff461c4 X509: URL validation didn't work (#1203) 2017-11-05 11:36:41 -06:00
terrafrost
6d51f2bf85 BigInteger: update bitwise_not fix for 2.0 2017-10-05 05:39:00 -05:00
terrafrost
245e7a15ca Merge branch '1.0' into 2.0 2017-10-05 05:37:56 -05:00
terrafrost
a7ebe7d39d BigInteger: fix bitwise_not for 0 2017-10-05 05:37:42 -05:00
terrafrost
29fabaaa18 RSA: replace != with !$this->_equals 2017-10-05 05:31:19 -05:00
terrafrost
d1470644a2 Merge branch '1.0' into 2.0 2017-10-05 05:28:47 -05:00
terrafrost
aeb8a98a25 Crypt/Base: fix version_compare call 2017-10-05 05:28:16 -05:00
terrafrost
33de8b82d6 Merge branch '1.0' into 2.0 2017-10-05 05:26:49 -05:00
terrafrost
042c8a9239 RC4: don't assume key is "\0" by default 2017-10-05 05:26:23 -05:00
terrafrost
2608074e74 Merge branch '1.0-use-eval' into 2.0-use-eval 2017-10-04 17:08:27 -05:00
terrafrost
98d46db7c5 Crypt/Base: use eval() instead of create_function() for >= 5.3 2017-10-04 17:03:14 -05:00
terrafrost
836d452acd Merge branch '1.0' into 2.0 2017-09-30 22:56:32 +01:00
terrafrost
6f47ef808e X509: fix issues when using datetime without a timezone set in ini 2017-09-30 22:54:33 +01:00
Martijn Smit
b3add4491d Replace extension_loaded with forward compatible function exists check 2017-09-29 21:33:57 +01:00
terrafrost
58768cb5aa Merge branch 'gmp-1.0' into gmp-2.0 2017-09-10 15:02:34 -05:00
terrafrost
b6d0e37432 BigInteger: use gmp_import / gmp_export when available 2017-09-10 14:56:57 -05:00
terrafrost
e50d8ea51c Merge branch '1.0' into ssh2-fix-multi-channel-1.0 2017-09-06 00:30:11 -05:00
terrafrost
eeaef39827 Merge branch 'ssh2-fix-multi-channel-1.0' into 2.0 2017-09-05 23:22:09 -05:00
terrafrost
a7eb9099f1 Merge branch '1.0' into 2.0 2017-09-05 22:00:35 -05:00
terrafrost
deb485c0e1 SFTP: fix put() with remote file stream resource (#1177) 2017-09-05 21:59:51 -05:00
terrafrost
a3325d102e SSH2: don't choke when getting response from diff channel in exec() 2017-08-29 00:17:48 -05:00
terrafrost
df1a650485 Merge branch '1.0' into 2.0 2017-08-28 23:31:51 -05:00
terrafrost
4b1102de7e X509: updates to DateTime integration 2017-08-28 23:29:03 -05:00
terrafrost
e669624ef5 Merge branch '1.0' into 2.0 2017-08-28 22:45:09 -05:00
terrafrost
c7e67721a2 SSH2: CS adjustment 2017-08-28 22:44:58 -05:00
terrafrost
c4be683936 Merge branch 'arcfour256-fix-1.0' into 2.0 2017-08-27 02:43:31 -05:00
terrafrost
e5b4eef91f SSH2: workaround for bad arcfour256 implementations 2017-08-26 20:17:59 -05:00
terrafrost
143d28bafa Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0 2017-08-25 00:13:32 -05:00
terrafrost
4202f653ef Merge branch '1.0' into 2.0 2017-08-24 23:55:27 -05:00
terrafrost
9cbfd23cb6 SSH2: assume any SSH server >= 1.99 supports SSH2 2017-08-24 23:52:27 -05:00
terrafrost
221a9be8e6 Merge branch 'datetime-1.0' into datetime-2.0 2017-08-24 12:50:00 -05:00
terrafrost
09c17b1a31 ASN1 / X509: update to use DateTime instead of unix time 2017-08-24 12:48:15 -05:00
terrafrost
a4c79db37a Merge branch '1.0' into 2.0 2017-08-08 21:53:07 -05:00
terrafrost
5c792f6bc1 ANSI: fix E_NOTICE when overflowing text overflows screen vertical 2017-08-08 21:44:22 -05:00
terrafrost
dfb6770891 Merge branch 'send-kex-and-id-first-or-last-1.0' into 2.0 2017-08-07 18:37:11 -05:00
terrafrost
7ccb0d0b02 SSH2: send KEXINIT packet and identification string first or last 2017-08-07 00:34:58 -05:00
terrafrost
f68a85e99b SSH1: backport fixes from rrran 2017-07-30 16:19:23 -05:00
terrafrost
6922e6d476 Merge branch '1.0' into 2.0 2017-07-30 10:18:31 -05:00
Yannick Breuer
acebfe28d6 DOC: Fix sftp errors var type 2017-07-30 10:18:08 -05:00
terrafrost
de18148e80 Merge branch '1.0' into 2.0 2017-07-16 11:32:04 -05:00
terrafrost
84d1628cb7 ANSI: make it so x position can't be negative 2017-07-16 11:31:25 -05:00