terrafrost
988d37e479
Merge branch '2.0'
2019-06-12 22:07:49 -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
c5a9a66d69
DSA: pass password parameter correctly to OpenSSH::load
2019-06-08 23:18:21 -05:00
terrafrost
327f555b7c
add expanded support for OpenSSH private keys
2019-06-08 22:04:54 -05:00
terrafrost
88b6337a3f
RSA: fix issue with PKCS1 encryption
2019-06-08 18:58:24 -05:00
terrafrost
a431a1959a
ECDSA: make it so toString() can setspecified / named curve use
2019-06-03 20:33:01 -05:00
terrafrost
557676edd9
use array type hint
2019-06-02 10:26:26 -05:00
terrafrost
30320f5a91
Merge branch '2.0-callback' into master-callback
2019-06-02 08:22:26 -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
8e03f5bfb2
RSA: make it so PSS keys can be saved
2019-06-01 19:35:17 -05:00
terrafrost
5b89ff4177
Merge branch 'rsa-pss'
2019-06-01 16:07:48 -05:00
terrafrost
b226c3d882
add second $options parameter to toString method for public keys
2019-06-01 15:53:35 -05:00
terrafrost
8017c74429
RSA: add preliminary support for RSA-PSS keys
2019-05-29 00:32:53 -05:00
terrafrost
79f925e43c
SFTP: replace user_error() with Exceptions
2019-05-28 08:52:53 -05:00
terrafrost
72b4bf74d2
SFTP: use microtime(true)
2019-05-28 08:50:22 -05:00
terrafrost
93c0880ca8
SSH2: make $timeout protected
2019-05-28 08:50:03 -05:00
terrafrost
a773ae80bd
Merge branch '2.0'
2019-05-28 08:47:59 -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
337b41f865
Merge branch 'master' into immutable-keys
2019-05-26 22:51:40 -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
10f79a86af
BigInteger: fix for BigInteger('-0')
2019-05-26 15:35:28 -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
7c270b9db3
Merge branch '2.0'
2019-05-26 10:29:34 -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
64542e699f
BigInteger: GMP engine didn't always return 1 or -1
2019-05-24 21:45:59 -05:00
terrafrost
d02f96e180
System/Agent: non-SSH2 signatures aren't *currently* supported
2019-05-23 08:57:46 -05:00
terrafrost
7c7d500d80
System/Agent: add support for DSA / ECDSA keys
2019-05-23 08:35:36 -05:00
terrafrost
85e2bd4811
SSH2: get binary output from OpenSSH key handler
2019-05-21 09:10:18 -05:00
terrafrost
e06f733528
ECDSA: add missing class variables for deterministic ECDSA
2019-05-21 00:03:21 -05:00
terrafrost
cc32cd2e95
make RSA / DSA / ECDSA immutable and add support to SSH2 / X509
2019-05-19 15:35:29 -05:00
terrafrost
b09bc1883e
Merge branch 'oid-revamp-2.0'
2019-05-02 07:28:27 -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
00b6eaf507
ECDSA/Keys/PKCS8: correctly convert private keys to public
2019-04-29 21:45:17 -05:00
terrafrost
227d9c45ef
Merge branch '2.0'
2019-04-11 21:56:27 -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
75f51fc8cc
BigInteger: make the bitwise methods better handle negative numbers
2019-04-10 06:53:00 -05:00
terrafrost
31c10f39e5
BigInteger/GMP: negative base-256 numbers didn't load correctly
2019-04-09 20:42:18 -05:00
terrafrost
114dc17f5b
BigInteger: toBits(true) wasn't working correctly
2019-04-08 08:02:48 -05:00
terrafrost
0e874f1d21
SSH/Agent: use Strings::packSSH2() / Strings::unpackSSH2()
2019-04-06 13:34:33 -05:00
terrafrost
cee3f3cd4a
SFTP: use Strings::packSSH2() / Strings::unpackSSH2()
2019-04-03 22:09:15 -05:00
terrafrost
0001b81950
SSH2: use Strings::packSSH2() / Strings::unpackSSH2()
2019-04-02 00:09:19 -05:00
terrafrost
f2226184ee
rm Common/Functions/Objects.php
2019-03-31 16:28:21 -05:00
terrafrost
d329814f55
SSH2: send_binary_packet() now always throws exceptions on error
2019-03-31 00:33:57 -05:00
terrafrost
1780bee619
SSH2: add support for elliptic curve hostkeys
2019-03-30 13:35:16 -05:00
terrafrost
c9d4a89267
rm SSH1
2019-03-29 21:51:26 -05:00
terrafrost
72209ffd65
add setPreferredAlgorithms() and getServerAlgorithms()
2019-03-29 18:44:31 -05:00
terrafrost
0cff98b19e
SSH2: make it so preferred algorithm depends on available engines
2019-03-28 22:15:04 -05:00
terrafrost
e629271f7d
SSH2: add getMethodsNegotiated() method
2019-03-28 18:53:26 -05:00
terrafrost
aa4c6e686a
Merge branch 'master' into chacha20
2019-03-26 08:36:07 -05:00
terrafrost
16abd15089
SSH2: micro-optimization for AES-GCM
2019-03-23 21:41:52 -05:00
terrafrost
70f5eb4bf7
SSH2: Rijndael -> AES (for consistency)
2019-03-23 20:53:20 -05:00
terrafrost
213516128a
Crypt: $use_inline_crypt is no longer used
2019-03-23 20:50:10 -05:00
terrafrost
34e065fec8
Merge branch '2.0'
2019-03-23 20:22:34 -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
539fc1a9b0
SSH2: CS adjustments
2019-03-23 19:20:06 -05:00
terrafrost
7d41903846
Merge branch '2.0'
2019-03-23 19:18:31 -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
494d20efc8
add Salsa20 / ChaCha20 stream ciphers
2019-03-22 15:45:36 -05:00
terrafrost
8ce392f218
SFTP: nlist() didn't return empty directories - now it does
...
I view this as a BC breaking change so atm do not plan on
backporting it to 1.0/2.0. eg. now, all subdirectories have . and
.. as "files" whereas before they didn't
2019-03-16 09:41:06 -05:00
terrafrost
09fdd60931
Merge branch '2.0'
2019-03-09 18:43:35 -06: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
37df27a4af
Merge branch '2.0'
2019-03-08 08:02:54 -06:00
terrafrost
4a920c3690
RSA: fix bad merge
2019-03-08 08:02:20 -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
496fcd18cd
Merge branch '2.0'
2019-03-03 18:42:47 -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
terrafrost
adc9a5d189
Merge branch '2.0'
2019-02-24 21:37:43 -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
bf7b1630ea
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2019-02-06 06:27:14 -06:00
terrafrost
ee742d4edb
Merge branch '2.0'
2019-02-05 23:31:20 -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
41c76d6e0e
SCP: replace user_error with exception
2019-01-27 17:10:06 -06:00
terrafrost
0f3cbce359
Merge branch '2.0'
2019-01-27 17:04:49 -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
c03753e3c7
Merge branch '2.0'
2019-01-20 09:17:57 -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
ea3c8dbd9a
Merge branch '2.0'
2019-01-16 21:17:18 -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
3f6eb2012a
Merge branch '2.0'
2019-01-15 23:50:33 -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
44a56b8a1f
BinaryField: fix issue with negate
2019-01-07 08:06:10 -06:00
terrafrost
c53ca28b25
BinaryField: CS adjustment
2019-01-07 06:42:00 -06:00
terrafrost
de63198197
PrimeField: docblock cleanup
2019-01-07 06:34:00 -06:00
terrafrost
4ae33f9bde
BinaryField: speed up multiplication for GCM and smaller curves
2019-01-07 06:33:11 -06:00
terrafrost
835b1207fa
SSH2: replace "$this->object !== false" with "$this->object"
2018-12-31 14:14:43 -06:00
terrafrost
17e6938fba
updates to Exceptions
2018-12-31 09:55:32 -06:00
terrafrost
c6f9807633
SymmetricKey: don't define self::$gcmField unless we're in GCM mode
2018-12-30 10:14:51 -06:00
terrafrost
f98e0afc76
AES: move GCM code to Rijndael
2018-12-30 02:15:06 -06:00
terrafrost
5abb16dc6d
SymmetricKey: simplify mode setup
2018-12-30 01:30:21 -06:00
terrafrost
a8d07e3dcb
SymmetricKey: make $cipher_name_openssl_ecb static
2018-12-29 23:21:18 -06:00
terrafrost
49be6e5529
Hash: rm function_exists calls for hash extension functions
2018-12-29 23:09:33 -06:00
terrafrost
e2256f4267
Hash: fix grammer error
2018-12-29 23:05:20 -06:00
terrafrost
97d41fd3aa
SSH2: make bad_algorithm_candidate method static
2018-12-29 20:54:18 -06:00
terrafrost
5126937d40
Rijndael: replace block size switch with a single variadic function
2018-12-29 19:35:05 -06:00
terrafrost
01c92a59f8
add support for Galois/Counter Mode (GCM)
2018-12-27 08:31:35 -06:00
terrafrost
a30cfff79c
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2018-12-16 19:04:43 -06:00
terrafrost
3dbc50c667
Merge branch 'post-ecdsa'
2018-12-16 19:03:44 -06:00
terrafrost
d37969a345
Merge pull request #1322 from terrafrost/ecdsa
...
add ECDSA / EdDSA support
2018-12-16 17:46:28 -06:00
terrafrost
b76a67dfb4
Merge branch '2.0'
2018-12-16 11:45:37 -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
8e977b4e59
ECDSA: CS adjustments to curves
2018-12-03 03:47:46 -06:00
terrafrost
7fb7e6ce52
Twofish: make tables static
2018-12-02 14:28:14 -06:00
terrafrost
e758878580
RC2: make pitable / invpitable tables static
2018-12-02 14:13:08 -06:00
terrafrost
b278bc7e7e
DES: make sboxes static
2018-12-02 13:59:42 -06:00
terrafrost
4679cb7bf7
Blowfish: make sboxes static
2018-12-02 12:42:53 -06:00
terrafrost
9bcd851e97
Blowfish: CS adjustments (" -> ')
2018-12-02 12:21:56 -06:00
terrafrost
5bcb298af7
SymmetricKey: throw an exception when en/de-crypting w/o a key
2018-12-02 12:01:56 -06:00
terrafrost
479fa4ce3d
BigInteger: add getEngine() static method
2018-12-02 10:58:07 -06:00
terrafrost
b4ef9a1cae
BigInteger: random() would error out if a BigInteger wasn't defined
2018-12-02 10:41:24 -06:00
terrafrost
3ecc62912d
throw exceptions when signing / verification is attempted w/o a key
2018-12-02 07:17:17 -06:00
terrafrost
8b2ef543ab
Merge branch '2.0'
2018-12-01 23:14:37 -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
ab49ab9dca
Merge branch '2.0'
2018-12-01 22:47:04 -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