terrafrost
ffb21d7622
SSH/Agent: fix bad merge
2018-05-27 11:27:19 -05:00
terrafrost
03f9a4dc7e
Merge branch '2.0'
2018-05-27 10:54:36 -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
0b2eb54a29
Merge branch '2.0'
2018-05-27 09:55:45 -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
08768998de
add appveyor.yml
2018-05-19 13:46:14 -05:00
terrafrost
8da15ab19b
Merge branch '2.0'
2018-05-19 07:48:42 -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
terrafrost
4b6a26acda
Merge pull request #1269 from henk23/patch-1
...
Fix composer require syntax in readme
2018-05-10 10:29:10 -05:00
henk23
cc6131a329
Fix composer require syntax in readme
...
According to https://getcomposer.org/doc/03-cli.md#require
2018-05-10 15:51:30 +02:00
terrafrost
78eb98311f
Merge branch '2.0'
2018-04-29 16:56:35 -05:00
Bilge
8c299f865f
Fixed some RSA docblock types.
2018-04-25 21:18:51 +01:00
terrafrost
03d59d73c0
Merge branch '2.0'
2018-04-15 11:55:13 -05:00
terrafrost
7053f06f91
Merge branch '1.0' into 2.0
2018-04-15 11:55:05 -05:00
terrafrost
fd33675e48
1.0.11 release
2018-04-15 11:51:35 -05:00
terrafrost
28b26b50df
Merge branch '2.0'
2018-04-15 10:31:12 -05:00
terrafrost
bbc651f0b6
Merge branch '1.0' into 2.0
2018-04-15 10:27:46 -05:00
terrafrost
3f226be600
Merge branch 'asn1-class-fix' into asn1-class-fix-test
2018-04-15 08:34:15 -05:00
terrafrost
7fc3cf69f8
Tests/ASN1: add test for commit 6dc7b3e
2018-04-15 08:30:02 -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
66aa5aec5c
Merge branch '2.0'
2018-04-10 19:00:13 -05:00
terrafrost
c2eb8436a9
CHANGELOG: validateLogic -> validateSignature
2018-04-10 18:58:51 -05:00
terrafrost
59047eabd2
Merge branch '1.0' into 2.0
2018-04-10 18:56:54 -05:00
terrafrost
038fbb1203
CHANGELOG: validateLogic -> validateSignature
2018-04-10 18:56:01 -05:00
terrafrost
ab270d1602
Merge branch '2.0'
2018-04-10 00:19:49 -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
48e50fe8fa
Tests/BigInteger: add test for conversion of 48 to signed hex
2018-04-09 23:36:36 -05:00
terrafrost
a3081aa7f8
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2018-04-03 20:30:27 -05:00
terrafrost
011f6ad200
BigInteger/PHP: make sure that zero is represented uniformly
2018-04-03 20:23:47 -05:00
terrafrost
d4b0e00d14
Tests/BigInteger: make sure that zero is represented uniformly
2018-04-03 20:19:14 -05:00
terrafrost
e7d96c7aeb
Merge branch '2.0'
2018-03-27 11:07:58 -05:00
terrafrost
3dae376e9c
Merge remote-tracking branch 'J5lx/2.0-cfb8' into 2.0
2018-03-27 11:06:11 -05:00
terrafrost
8b830700cf
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2018-03-27 11:04:25 -05:00
terrafrost
898b14aa05
Merge branch '2.0'
2018-03-27 11:01:45 -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
12bd06210c
Merge pull request #1250 from luzpaz/misc-typos
...
Misc. trivial typos
2018-03-03 15:41:58 -06:00
terrafrost
e9bff8a4de
X509: cs updates
2018-03-03 13:57:23 -06:00
terrafrost
1ee4167a03
Merge branch '2.0'
2018-03-03 13:44:36 -06: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
6c4a108a92
Merge branch 'authority-info-access-2.0' into authority-info-access-master
2018-03-03 08:09:26 -06:00
terrafrost
40730d2977
X509: update intermediate cert changes to work on 2.0 branch
2018-03-03 07:46:03 -06:00