Sokolovskyy Roman
0178d4f56e
Fix: Local variable to property
...
Fix: Constants names
2017-07-20 11:01:47 +02:00
terrafrost
669a7542ea
Merge branch '2.0'
2017-07-16 11:32:15 -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
terrafrost
7ef3864d22
RSA: RSAKeyValue -> RSAKeyPair for XML private keys
2017-06-28 23:19:50 -05:00
terrafrost
b46bedbdf7
SymmetricKey: use static::class instead of getClassContext() method
2017-06-28 07:34:51 -05:00
terrafrost
4171262b9e
SymmetricKey: use strings for constructor and setPreferredEngine
2017-06-28 06:54:10 -05:00
terrafrost
819a165246
RSA: add enableBlinding() / disableBlinding() static methods
2017-06-26 23:19:30 -05:00
terrafrost
1630a6710d
RSA/DSA: support XML keys with XML declarations
2017-06-26 21:58:20 -05:00
terrafrost
62a8047fa1
Hash: use hash extension for sha512/224 & sha512/256 on PHP 7.1+
2017-06-26 21:45:29 -05:00
terrafrost
5fe629a171
BigInteger: modularize / modernize class and add new powmod engines
2017-06-26 20:07:10 -05:00
Matej Kravjar
47c419545a
Fixed #632 Fatal error: Cannot access self:: when no class scope is active
2017-06-20 12:43:42 +02:00
terrafrost
0bbac3ebed
Merge branch '2.0'
2017-06-19 22:37:21 -05:00
terrafrost
3cbb9516ef
Merge branch '1.0' into 2.0
2017-06-19 22:35:22 -05:00
terrafrost
b6eb7b2009
Merge branch '2.0'
2017-06-19 22:34:28 -05:00
terrafrost
9814140055
Merge branch '1.0' into 2.0
2017-06-19 22:34:20 -05:00
Moritz Kornher
7606f81279
Add new mode READ_NEXT to only ready the next packet from the channel.
2017-06-19 22:33:08 -05:00
terrafrost
8ea3edf0d2
Merge branch '2.0'
2017-06-12 22:37:06 -05:00
terrafrost
9d0c924cbd
Merge branch '1.0' into 2.0
2017-06-12 22:36:58 -05:00
Sidney Souza
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
terrafrost
03ca09a104
Merge branch '2.0'
2017-06-12 21:26:20 -05:00
terrafrost
53acccdb08
Merge branch '1.0' into 2.0
2017-06-12 21:19:18 -05:00
David Hedberg
bbf467babd
SFTP: Add enablePathCanonicalization()/disablePathCanonicalization()
2017-06-12 21:17:55 -05:00
terrafrost
0bb6c9b974
SFTP: rm NO_REALPATH changes
2017-06-05 01:30:30 -05:00
terrafrost
1564a27f6e
SFTP: make NO_REALPATH apply to get() as well
2017-06-05 00:44:29 -05:00
David Hedberg
5979ed571f
SFTP: Add a NO_REALPATH option to put()
2017-06-05 00:12:57 -05:00
terrafrost
6ca7323401
Merge branch '2.0'
2017-05-29 06:33:24 -05:00
terrafrost
a4cd384bab
Merge branch '1.0' into 2.0
2017-05-29 06:32:23 -05:00
terrafrost
a451dd69f8
RSA: reset variables if bad key was loaded
2017-05-29 06:31:54 -05:00
terrafrost
e9d21367fa
Merge branch '1.0' into 2.0
2017-05-28 09:57:45 -05:00
terrafrost
228b60cfe5
Random: suppress E_DEPRECATED errors
2017-05-28 09:53:02 -05:00
terrafrost
a312a1d4f0
SSH2: update a few function calls to work with renamed methods
2017-05-28 09:44:38 -05:00
terrafrost
c25eb3ed9b
Merge branch 'master-crypt-fix-old-openssl'
2017-05-14 15:35:22 -05:00
terrafrost
83514e3991
Merge pull request #1127 from terrafrost/crypt-fix-old-openssl
...
Crypt: fix OpenSSL engine on <= PHP 5.3.6 (1.0 branch)
2017-05-14 15:34:22 -05:00
terrafrost
ae41ac1ac3
Merge pull request #1128 from terrafrost/2.0-crypt-fix-old-openssl
...
Crypt: fix OpenSSL engine on <= PHP 5.3.6 (2.0 branch)
2017-05-14 15:34:16 -05:00
terrafrost
baeb68eb82
Merge branch '2.0'
2017-05-14 08:50:57 -05:00
terrafrost
4b24877a2c
Merge branch '1.0' into 2.0
2017-05-14 08:50:13 -05:00
terrafrost
19c71e4a98
X509: include subjectaltname extension even if only one domain name
2017-05-14 08:49:04 -05:00
terrafrost
085d5ed495
Merge branch '2.0-crypt-fix-old-openssl'
2017-05-13 23:24:53 -05:00
terrafrost
9fc9d2fa19
Merge branch 'crypt-fix-old-openssl' into 2.0
2017-05-13 23:21:14 -05:00
terrafrost
a983412ea9
Crypt: fix OpenSSL engine on <= PHP 5.3.6
2017-05-13 23:18:42 -05:00
terrafrost
5c51c2570c
Merge branch '2.0'
2017-05-11 07:33:55 -05:00
Remi Collet
9706f37644
fix permission
2017-05-08 17:23:20 +02:00
terrafrost
31f4406b6e
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2017-05-07 15:08:36 -05:00
terrafrost
84d40ad8e0
Merge branch '2.0'
2017-05-07 13:26:39 -05:00
terrafrost
64dd2e064b
Merge branch '1.0' into 2.0
2017-05-07 13:26:27 -05:00
terrafrost
35a1102c0b
SFTP: fix put() with php://input as source
2017-05-07 13:25:43 -05:00
Casper Langemeijer
4a0118bae6
Refactor create_function() into anonymous function
2017-04-17 15:35:00 +02:00
terrafrost
4a069f7c85
rm redundant files
2017-04-15 19:35:07 -05:00
terrafrost
4058e3e217
Merge pull request #1090 from terrafrost/dsa-test-2
...
add DSA implementation
2017-04-15 15:49:04 -05:00
terrafrost
0a6fe37285
Merge branch '2.0'
2017-04-09 10:30:23 -05:00
terrafrost
f4ae2cf3d3
Merge branch '1.0' into 2.0
2017-04-09 10:23:20 -05:00
Moritz Fain
7fd1eefd66
Fixed ASN.1 UTCTime parsing
2017-04-09 10:15:40 -05:00
terrafrost
22bf2339d7
Merge branch '2.0'
2017-03-07 22:20:21 -06:00
terrafrost
52dcabb279
Merge pull request #1104 from metaclassing/fix-array-map-namespace
...
namespacing the array_map function
2017-03-07 21:50:41 -06:00
Metaclassing
42a7ff61ff
namespacing the array_map function
2017-03-07 15:22:44 -06:00
terrafrost
9cbf357ac5
Merge branch '2.0'
2017-03-01 22:27:31 -06:00
terrafrost
ecb92ad25c
Merge branch '1.0' into 2.0
2017-03-01 22:27:00 -06:00
terrafrost
8abc0ee60c
SSH2: include <pre> tags in getLog result when SAPI isn't CLI
2017-03-01 22:26:29 -06:00
terrafrost
9f4f288005
Merge branch '1.0' into 2.0
2017-03-01 22:24:59 -06:00
terrafrost
b8ceb96bd4
SSH2: include <pre> tags in getLog result when SAPI isn't CLI
2017-03-01 22:18:38 -06:00
terrafrost
42def63b00
Merge remote-tracking branch 'upstream/master' into dsa-test-2
2017-02-02 21:07:47 -05:00
terrafrost
ab1da5ac1f
Merge pull request #1084 from terrafrost/php5-updates
...
PHP5 updates for master branch
2017-02-02 21:03:07 -05:00
terrafrost
eb459daeaf
add DSA implementation
2017-02-02 20:20:47 -05:00
terrafrost
7d2e44b430
Merge branch '2.0'
2017-01-27 12:40:23 -06:00
terrafrost
ac2b7ef76c
Merge branch '1.0' into 2.0
2017-01-27 12:17:04 -06:00
terrafrost
1bde98fc42
Crypt: OpenSSL apparently supports variable size keys
2017-01-27 11:20:22 -06:00
terrafrost
8e44671766
visibility fixes
2017-01-21 15:51:49 -06:00
terrafrost
a25c841108
Merge remote-tracking branch 'upstream/master' into php5-updates
2017-01-17 22:40:24 -06:00
terrafrost
b9b4f67a0f
Net: add public / private / protected
2017-01-17 10:23:28 -06:00
terrafrost
fae358cc3c
BigInteger: use public / private / protected
2017-01-05 00:20:18 -06:00
terrafrost
c8c61055d1
Merge branch '2.0'
2016-12-24 21:34:30 -06:00
terrafrost
95335f9560
SSH2: update PTY changes for 2.0 branch
2016-12-24 21:20:13 -06:00
terrafrost
6aa31b2cd1
Merge branch '1.0' into 2.0
2016-12-24 21:10:50 -06:00
terrafrost
785b477605
Merge branch 'pty-enhancement' into 1.0
2016-12-24 20:28:19 -06:00
terrafrost
68b5a8896f
Merge branch '2.0'
2016-12-24 20:06:51 -06:00
terrafrost
f74ba2c581
Merge branch '1.0' into 2.0
2016-12-24 19:49:30 -06:00
terrafrost
da6e5211df
X509: ignore certificate transparency extension
2016-12-17 17:41:56 -06:00
terrafrost
2a7c99ef1b
...
2016-12-17 17:22:11 -06:00
terrafrost
a72a168400
Merge branch '1.0' into 2.0
2016-12-17 17:03:08 -06:00
vladimirghetau
d80794b1d9
exec authentication, code reuse
2016-12-17 16:37:04 -06:00
terrafrost
b26f14e5fe
SSH2: make it so disabling PTY closes exec() channel if it's open
2016-12-17 16:09:48 -06:00
terrafrost
9ae5206588
RSA: setEngine -> setPreferredEngine (make it like SymmetricKey)
2016-12-11 09:59:50 -06:00
terrafrost
242e0dcb7f
Files: add public / protected / private
2016-12-11 08:23:59 -06:00
terrafrost
e6e34f3543
Merge pull request #1065 from terrafrost/asn1-revamp-pt3
...
ASN.1 revamp
2016-12-10 19:27:37 -06:00
terrafrost
1dfd315725
RSA: use public / private / protected
2016-12-10 19:09:54 -06:00
terrafrost
813b85b5b2
Crypt: define visibility for more variables / methods
2016-12-09 16:46:01 -06:00
terrafrost
067c1882e5
SymmetricCiphers: rm some redundant methods / variables
2016-12-09 15:51:31 -06:00
terrafrost
d34a911402
SymmetricCiphers: don't cache "hi-optimized code"
...
Also add a new engine - ENGINE_EVAL. Previously ENGINE_INTERNAL
had three different modes - a "hi-optimized" version, a
"lo-optimized" version and a version that didn't depend on
create_function and there wasn't a way to really isolate these
modes and test them individually.
2016-12-08 09:20:19 -06:00
terrafrost
2a1177b256
SymmetricCiphers: add public / private / protected as appropriate
2016-12-07 22:19:20 -06:00
terrafrost
496fb80020
Strings: make this an abstract class as well
2016-11-30 21:43:03 -06:00
terrafrost
c852bae3c8
use short array syntax for arrays
2016-11-30 21:29:38 -06:00
terrafrost
7182ec393b
make classes with only static methods abstract
2016-11-30 09:25:04 -06:00
terrafrost
72a6aab872
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2016-11-29 23:18:44 -06:00
terrafrost
e34e5f5135
Merge branch '2.0'
2016-11-29 23:00:03 -06:00
terrafrost
024ac81d04
Merge branch '1.0' into 2.0
2016-11-29 19:26:11 -06:00
terrafrost
d0cb855bbc
Merge branch '1.0-suppress-unpack-errors' into 1.0
2016-11-29 19:16:16 -06:00
terrafrost
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
terrafrost
a4d05f8445
ASN1: rm an alternative approach for dealing with ASN1\Element
2016-11-29 08:15:08 -06:00
terrafrost
4dc3b7ed43
ASN1: don't return false after exception is thrown
2016-11-28 22:40:55 -06:00
terrafrost
370fbec300
ASN1: don't require octet / bit strings be base64-encoded
2016-11-28 20:51:21 -06:00
terrafrost
874ada8d93
ASN1: make methods static
2016-11-27 22:38:11 -06:00
terrafrost
df6d55fd97
ASN1: move ASN1 maps to external files for reuse
2016-11-22 23:56:07 -06:00
terrafrost
865904f636
Merge branch '2.0'
2016-11-20 18:13:48 -06:00
terrafrost
de3bb2e300
Merge branch '1.0' into 2.0
2016-11-20 18:13:41 -06:00
terrafrost
6fb34887c5
SFTP: change queue size to 32 (max packet size is 32kb so 32*32=1M)
2016-11-20 18:13:01 -06:00
terrafrost
ad03dcad1c
Merge branch '2.0'
2016-11-20 18:05:02 -06:00
terrafrost
27a6b6362a
Merge branch '1.0' into 2.0
2016-11-20 18:04:55 -06:00
terrafrost
a2d9622bf9
SFTP: update directory deletion check ( #1059 )
2016-11-20 18:03:01 -06:00
terrafrost
6807791d42
Merge branch '2.0'
2016-11-20 11:14:48 -06:00
terrafrost
abf3899e1f
Merge branch '1.0' into 2.0
2016-11-20 11:14:35 -06:00
terrafrost
7cb66ea56e
SSH2: don't use timeout value of 0 for fsockopen
2016-11-20 11:08:53 -06:00
terrafrost
48cf16599b
suppress unpack() PHP warnings
2016-11-19 22:39:36 -06:00
terrafrost
b8e1a15291
Merge branch '2.0'
2016-11-19 20:40:04 -06:00
terrafrost
f981310266
Merge branch '1.0' into 2.0
2016-11-19 20:39:58 -06:00
terrafrost
b70cb87641
SFTP: don't delete directory if $path is empty
2016-11-19 20:39:05 -06:00
terrafrost
d1fa327ef9
Merge branch '2.0'
2016-11-18 20:48:18 -06:00
terrafrost
51bafdebe2
SFTP: CS adjustment
2016-11-18 20:48:01 -06:00
terrafrost
d6bf2b4f73
Merge branch '2.0'
2016-11-18 20:37:26 -06:00
terrafrost
8b4208ee60
SFTP: logging didn't work correctly in 2.0 branch
2016-11-18 20:37:08 -06:00
terrafrost
df4ed58401
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0
2016-11-17 20:54:56 -06:00
terrafrost
99a2127856
Hash: fix E_NOTICE with PHP4-style constructor
2016-11-17 20:54:38 -06:00
terrafrost
272ae9c64c
Merge branch 'master' into pkcs18-rewrite
2016-11-17 08:10:55 -06:00
terrafrost
863ff6789b
RSA: refactor PKCS1/PKCS8 to facilitate re-use
2016-11-17 08:09:10 -06:00
terrafrost
2d2bf2990e
Merge branch '2.0'
2016-11-08 09:23:53 -06:00
terrafrost
a47eccf6f9
Merge branch '1.0' into 2.0
2016-11-08 09:22:05 -06:00
terrafrost
535104cb84
SSH2: send the identifier first, before reading it
2016-11-08 09:11:57 -06:00
Łukasz Bajsarowicz
e837cc2054
Incorrect namespace hint
2016-11-04 02:25:56 -05:00
terrafrost
88e58c75d0
don't go out of our way to support < PHP 5.3
...
...not when phpseclib 2.0 requires PHP 5.3+
2016-10-02 22:07:33 -05:00
terrafrost
7ae4ea3e71
Merge branch '1.0' into 2.0
2016-10-02 21:56:59 -05:00
terrafrost
3c149e0e6a
Merge branch '1.0-32bit-fixes' into 1.0
2016-10-02 21:39:16 -05:00
terrafrost
711079764e
Merge branch '2.0'
2016-10-02 08:18:16 -05:00
terrafrost
42f5399960
Crypt/Base: fix bad merge
2016-10-02 08:09:54 -05:00
terrafrost
42fb96db16
fix float to int conversions on 32-bit linux PHP < 5.3 installs
2016-10-02 03:37:23 -05:00
terrafrost
3205c95177
Merge branch '1.0' into 2.0
2016-10-01 20:05:16 -05:00
terrafrost
d68975117c
RC2: rm empty constructor
2016-09-23 21:55:26 -05:00
terrafrost
a862837a9a
Merge remote-tracking branch 'origin/danog2'
2016-09-23 10:20:07 -05:00
terrafrost
640f10609f
fix PHP 7.1 compatibility errors
2016-09-21 01:21:54 -05:00
terrafrost
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
terrafrost
c17a2604a0
Merge branch 'master-reorg'
2016-09-17 09:15:11 -07:00
terrafrost
c1d407d7cf
Merge branch '1.0' into 2.0
2016-09-11 21:22:53 -07:00
terrafrost
ff7bc85a8f
SFTP: backport "parallel" upload code from master branch
2016-09-11 21:11:52 -07:00
terrafrost
03937a7933
Merge branch '2.0'
2016-09-10 11:16:52 -07:00
terrafrost
222ad56285
Merge branch '1.0' into 2.0
2016-09-10 11:04:52 -07:00
terrafrost
845135f887
add PHP5-style constructors along side PHP4-style ones
2016-09-10 10:41:05 -07:00
terrafrost
0ee24aa218
BigInteger: rm loopforeach method
2016-09-09 20:59:54 -08:00
terrafrost
72d1bdf60b
a few changes to danog's changes
2016-09-08 00:22:30 -08:00
terrafrost
6f22a957c2
Merge branch '2.0'
2016-08-28 23:17:11 -05:00
terrafrost
f30f8045fd
Merge branch '1.0' into 2.0
2016-08-28 23:17:06 -05:00
Michel Bardelmeijer
1eda62913a
Handle empty fread return correctly which resolves zero-byte file issues
2016-08-28 23:16:53 -05:00