mdelikat
d9195ea5bd
validateSignature if subjectKeyIdentifier is not set and check serial number if is set
2017-12-13 19:05:06 -06:00
terrafrost
1587c5498b
Merge branch '1.0-travis-exp' into 2.0-travis-exp
2017-12-03 20:22:57 -06:00
terrafrost
2e2c22b921
Travis: enable PHP 7.2 support
2017-12-03 15:33:15 -06:00
terrafrost
12090c138e
Tests/X509: update 1.0 test to work on 2.0
2017-11-05 11:42:33 -06:00
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
Martijn Smit
b3add4491d
Replace extension_loaded with forward compatible function exists check
2017-09-29 21:33:57 +01:00
terrafrost
74d3a51183
Merge branch 'ssh2-fix-multi-channel-1.0' into ssh2-fix-multi-channel-2.0
2017-09-06 00:27:52 -05:00
terrafrost
ed3846a7a2
Tests/SSH2: add unit test for #1167
2017-09-06 00:27:07 -05:00
terrafrost
a9cd28d8fd
Tests/ANSI: update test for 2.0 branch
2017-08-08 21:53:37 -05:00
terrafrost
a4c79db37a
Merge branch '1.0' into 2.0
2017-08-08 21:53:07 -05:00
terrafrost
89188ec570
Tests/ANSI: add test for #1161 E_NOTICE in ANSI
2017-08-08 21:35:48 -05:00
terrafrost
ce2bfd984e
Tests: fix CS errors
2017-07-16 12:09:45 -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
fe8f1bba7b
Tests/RSA: update unit test for 2.0 branch
2017-05-29 06:33:01 -05:00
terrafrost
a4cd384bab
Merge branch '1.0' into 2.0
2017-05-29 06:32:23 -05:00
terrafrost
f089aa4eb9
Tests/RSA: add unit test for loading bad key after loading good key
2017-05-29 06:20:46 -05:00
terrafrost
5e2afe3a73
Merge branch '1.0' into 2.0
2017-05-28 09:10:58 -05:00
terrafrost
9bccc01b97
Tests/SSH2: add unit test for #1009
2017-05-28 08:58:00 -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
91a0866fdc
Tests/X509: add unit test for issue involving multiple domain names
2017-03-07 21:54:41 -06:00
terrafrost
062ee6b5b5
Tests: crypt_random_string -> Random::string
2017-01-27 12:35:48 -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
Andreas Fischer
f5d8377cdb
Backport tests/bootstrap.php from 2.0 / master onto 1.0.
2016-10-20 21:30:42 +02:00
terrafrost
6dc50cc5c9
ASN1: update unit test for 2.0 branch
2016-08-28 10:45:31 -05:00
terrafrost
281cfcdcea
Merge branch '1.0' into 2.0
2016-08-28 10:45:04 -05:00
terrafrost
5c2ffd2544
ASN1: fix infinite loop during ASN1 decode process
2016-08-28 10:43:33 -05:00
terrafrost
c547ee16c7
Merge branch '1.0' into 2.0
2016-08-04 00:31:15 -05:00
klemens
dca95ac662
spelling fixes
2016-08-04 00:19:27 -05:00
terrafrost
e59e544ed8
Merge branch '1.0' into 2.0
2016-07-23 18:55:35 -05:00
terrafrost
62381365c8
Tests/X509: make dn more generic in unit test
2016-07-23 18:54:25 -05:00
terrafrost
2c4dcd96b4
fix issue with merge
2016-07-23 18:39:25 -05:00
terrafrost
dbdba0b7ef
Merge branch '1.0' into 2.0
2016-07-23 18:16:52 -05:00
terrafrost
dc7f7e4d85
ASN1: fix PHP Warning on PHP 7.1
2016-07-23 11:01:43 -05:00
terrafrost
97f0b37bd5
Merge branch '1.0' into 2.0
2016-07-10 12:55:56 -05:00
terrafrost
8530cbca1a
Tests/SFTP: demo "Expected SSH_FXP_STATUS or ..." error
2016-06-29 00:18:35 -05:00
terrafrost
9ce8a39204
Tests/RSA: update unit test to work on 2.0 branch
2016-06-21 22:39:33 -05:00
terrafrost
b08f17f514
Merge branch '1.0' into 2.0
2016-06-21 22:39:05 -05:00
terrafrost
5b8985447c
Tests/RSA: update unit test to work with 1.0 branch
2016-06-21 22:38:37 -05:00
andrewbelcher
dd754283bb
Fix zero salt length RSA signatures.
2016-06-21 22:33:47 -05:00
terrafrost
a2e77a7728
Merge branch 'x509-constructed-dns-2.0' into 2.0
2016-06-12 14:19:39 -05:00
terrafrost
002a927746
Merge branch 'x509-constructed-dns' into 1.0
2016-06-12 14:19:08 -05:00
terrafrost
706dcfb8d6
RSA: update unit test for 2.0 branch
2016-06-04 23:22:02 -05:00
terrafrost
87040bc518
Merge branch '1.0' into 2.0
2016-06-04 22:56:49 -05:00
terrafrost
942d194d0a
RSA: don't attempt to use the CRT when zero value components exist
2016-05-09 13:46:28 -05:00
terrafrost
700338beed
Merge branch '1.0' into 2.0
2016-05-06 11:58:07 -05:00
terrafrost
e762b0dc29
SFTP: add is_writable, is_writeable and is_readable
2016-05-05 16:41:15 -05:00
terrafrost
305dc1967a
Tests/X509: fix bad merge
2016-05-04 00:16:08 -05:00
terrafrost
538b48c346
Merge branch 'x509-constructed-dns' into x509-constructed-dns-2.0
2016-05-03 20:06:48 -05:00
terrafrost
52a7aee1f5
X509: add support for constructed DNs and non-strict DN checks
2016-05-03 18:22:53 -05:00
terrafrost
8fb4c3363d
undo merging of master to 2.0 branch
2016-04-28 15:34:10 -05:00
terrafrost
b4cf10fc94
Revert "Merge branch '2.0'"
...
This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing
changes made to 638fe6971c
2016-04-10 11:30:59 -05:00
terrafrost
4b69dcb1ca
Revert "Merge remote-tracking branch 'bantu/bootstrap'"
...
This reverts commit ef04c870e9cd57bf31ae
2016-04-10 11:25:31 -05:00
terrafrost
263564a2ee
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2016-04-09 13:00:51 -05:00
terrafrost
86646fdf40
RSA: PKCS1 v2.2 also added sha224
2016-04-09 12:57:23 -05:00
terrafrost
a3000aac28
Tests/RSA: CS adjustment
2016-04-03 22:56:48 -05:00
terrafrost
383bceb1a9
Tests/RSA: fix bad merge
2016-04-03 22:07:49 -05:00
terrafrost
9cf93a02b3
Merge branch '2.0'
2016-04-03 21:37:52 -05:00
terrafrost
8f614a0538
RSA: update macdabby's changes to work on 2.0 branch
2016-04-03 21:35:33 -05:00
terrafrost
a7f2a5d9c9
Merge branch '1.0' into 2.0
2016-04-03 21:34:45 -05:00
terrafrost
ac97ce5d69
RSA: backport macdabby's changes
2016-04-03 21:34:11 -05:00
terrafrost
3b37619279
Tests/RSA: add unit test for setPrivateKey
2016-04-03 21:16:37 -05:00
terrafrost
a757584630
Hash: add sha512/224 and sha512/256
2016-03-24 12:49:27 -05:00
terrafrost
2ae82a1bc7
Merge branch '2.0'
2016-03-19 12:23:11 -05:00
terrafrost
6bfbfdbf7e
Merge branch '1.0' into 2.0
2016-03-19 12:23:04 -05:00
terrafrost
56acb6723c
Tests/BigInteger: add unit test for abhishektaneja's sliding window fix
2016-03-19 12:06:12 -05:00
terrafrost
574d36fb7d
Merge branch 'cipher-revamp'
2016-03-14 23:00:21 -05:00
terrafrost
ea7d647612
Merge branch 'cipher-revamp'
2016-03-14 22:42:51 -05:00
terrafrost
ac8960d049
Merge branch '2.0'
2016-03-02 10:13:28 -06:00
terrafrost
e666562569
Merge branch '1.0' into 2.0
2016-03-02 10:13:15 -06:00
terrafrost
da36b5c91e
RC2: fix issue with decrypting
2016-03-01 16:30:36 -06:00
terrafrost
7558f097c0
Tests/AES: update newest unit test
2016-02-20 21:44:39 -06:00
terrafrost
ae1e5c13f9
Merge branch 'master' into cipher-revamp
2016-02-20 21:44:00 -06:00
terrafrost
1e50a102ac
Merge branch '2.0'
2016-02-20 14:16:06 -06:00
terrafrost
b566fcaeee
Tests/AES: Crypt_AES -> AES
2016-02-20 14:15:57 -06:00
terrafrost
82ab57e14c
Merge branch '2.0'
2016-02-19 15:19:30 -06:00
terrafrost
6d3c04ef4d
Merge branch '1.0' into 2.0
2016-02-19 15:19:20 -06:00
terrafrost
b69fa7f2a9
Merge branch '2.0'
2016-02-07 11:54:16 -06:00
terrafrost
b972a4b36d
Tests/AES: add unit test for continuous mode
2016-02-05 23:29:20 -06:00
terrafrost
e74841477f
Crypt: become a lot less tolerant of bad parameters
2016-02-03 08:56:25 -06:00
terrafrost
73a4221988
Crypt: become a lot less tolerant of bad parameters
2016-01-31 12:37:38 -06:00
metaclassing
88a04862ae
Added unit test for IPv4 and IPv6 address decoding in X509v3 subject alternative names extended attribute
2016-01-27 05:13:47 -06:00
terrafrost
977a4ebeaa
Merge pull request #925 from terrafrost/rsa-revamp-part-3
...
RSA: error out when encrypting strings that are too long
2016-01-21 10:20:53 -06:00
terrafrost
d5a868ed4f
Crypt/Base: throw an exception if an IV is required but not defined
2016-01-17 11:48:07 -06:00
terrafrost
5d85d5eca1
RSA: error out when encrypting strings that are too long
2016-01-17 09:45:13 -06:00
terrafrost
ad4c3670d3
Merge branch 'biginteger-revamp'
2016-01-16 22:59:19 -06:00
terrafrost
f8dc527af5
Merge branch 'master' into biginteger-revamp
2016-01-08 10:43:49 -06:00
terrafrost
232880b0d9
Merge branch '2.0'
2016-01-08 10:43:11 -06:00
terrafrost
62fc4bbc88
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0
2016-01-08 10:42:59 -06:00
terrafrost
1e15ef5a55
Merge branch 'bitwise-not-1.0' into 2.0
2016-01-08 10:42:20 -06:00
terrafrost
7ad9eade2d
BigInteger: fix issue with doing bitwise not on 0
2016-01-08 10:31:48 -06:00
terrafrost
f7efbcbc8e
BigInteger: updates per Joey3000
2016-01-08 10:19:48 -06:00
terrafrost
d86c61de78
BigInteger: add getprecision
2016-01-03 10:42:44 -06:00
terrafrost
a0d21b6321
BigInteger: make select methods static, add type hinting, etc
2015-12-27 10:24:17 -06:00
terrafrost
806249c7e9
RSA: changes to how encryption / signatures work
2015-12-25 11:28:24 -06:00
terrafrost
94fdbba2aa
Merge branch '2.0'
2015-12-23 23:42:23 -06:00
terrafrost
001ad99d73
Merge branch '1.0' into 2.0
2015-12-23 23:32:20 -06:00
terrafrost
1be0ac9f7f
SFTP/Stream: fix issue with filenames with hash in them
2015-12-23 13:13:06 -06:00
terrafrost
d17aeffc04
Merge branch 'authenticated-1.0' into authenticated-2.0
2015-12-16 09:20:27 -06:00
terrafrost
57063f3604
SSH2: add isAuthenticated() method
2015-12-15 23:19:05 -06:00
terrafrost
adf6ea07e8
Merge branch '2.0'
2015-12-14 13:28:50 -06:00
terrafrost
89af727f32
Merge branch '1.0' into 2.0
2015-12-14 13:28:10 -06:00
terrafrost
cae579a19b
Tests/BigInteger: update testDebugInfo test
2015-12-14 13:26:56 -06:00
terrafrost
9f529623da
Merge branch '2.0'
2015-12-14 13:03:24 -06:00
terrafrost
2d2f359300
Tests/BigInteger: fix for 2.0 branch
2015-12-14 13:03:07 -06:00
terrafrost
786cecf309
Merge branch '1.0' into identifier-update-1.0
2015-12-14 11:07:42 -06:00
terrafrost
b86497d298
Merge branch '2.0'
2015-12-14 11:02:14 -06:00
terrafrost
8448f63d76
Merge branch '1.0' into 2.0
2015-12-14 11:01:51 -06:00
terrafrost
f17f1b2baf
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into small-tweaks-2
2015-12-11 13:44:39 -06:00
terrafrost
d8b74a7ee0
SSH2: update unit test
2015-12-07 22:02:02 -06:00
terrafrost
c655b16f75
BigInteger: add engine to __debugInfo output and add unit test
2015-12-07 15:22:53 -06:00
Andreas Fischer
9f0f8fd7e5
Correct indentation on pvno array definition.
2015-12-05 10:33:28 -06:00
Andreas Fischer
27bf47e7a4
Merge branch '2.0'
...
* 2.0:
Correct indentation on pvno array definition.
2015-12-01 10:06:20 +01:00
Andreas Fischer
694579617e
Merge branch '1.0' into 2.0
...
* 1.0:
Correct indentation on pvno array definition.
2015-12-01 10:06:19 +01:00
Andreas Fischer
2e8e4bf04a
Correct indentation on pvno array definition.
2015-11-29 18:44:21 +01:00
Andreas Fischer
230cc88327
Merge branch '2.0'
...
* 2.0:
Removed the deprecated "--dev" argument from the recommended composer command. When that argument is specified, composer prints the following:
2015-11-10 10:23:08 +01:00
Andreas Fischer
2f5dbc1711
Merge pull request #868 from bantu/composer_test_message-2.0
...
Removed the deprecated "--dev" argument from the recommended composer…
* bantu/composer_test_message-2.0:
Removed the deprecated "--dev" argument from the recommended composer command. When that argument is specified, composer prints the following:
2015-11-10 10:23:08 +01:00
Andreas Fischer
3793f34876
Merge branch '2.0'
...
* 2.0:
RSA: fix issue with loading PKCS8 specific keys
Tests/RSA: add unit test for loading PKCS8 specific keys
2015-11-10 10:13:32 +01:00
Mark McEver
1a7d9aafd7
Removed the deprecated "--dev" argument from the recommended composer command. When that argument is specified, composer prints the following:
...
You are using the deprecated option "dev". Dev packages are installed by default now.
2015-11-10 09:49:19 +01:00
terrafrost
c34be16c3a
Merge branch 'rsa-pkcs8-fix' into rsa-pkcs8-fix-2.0
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-11-09 23:10:21 -06:00
terrafrost
e8d75b2e8d
Tests/RSA: add unit test for loading PKCS8 specific keys
2015-11-09 22:10:08 -06:00
terrafrost
43165d976c
RSA: changes to OpenSSH and PuTTY plugins
2015-10-24 15:54:34 -05:00
terrafrost
7b1b7c22e2
RSA: throw an exception if the modulo is too small
2015-10-23 13:45:35 -05:00
terrafrost
1522e6606b
RSA: add getSupportedFormats() and getLoadedFormat()
2015-10-22 10:57:05 -05:00
terrafrost
efe36d67ce
Merge branch 'master' into rsa-plugins
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-10-22 10:16:52 -05:00
terrafrost
33bf6e42c3
Merge branch '2.0'
2015-10-22 10:14:50 -05:00
terrafrost
96dd14fd6f
Merge branch 'extractber-fix' into extractber-fix-2.0
...
Conflicts:
phpseclib/File/X509.php
2015-10-22 09:56:07 -05:00
terrafrost
46bb95a265
X509: improve base64-encoded detection rules
2015-10-22 09:45:40 -05:00
terrafrost
e2fcd9d951
RSA: misc fixes to select plugins
2015-10-21 21:24:12 -05:00
terrafrost
6eb5ea3ef7
RSA: add support for the microsoft BLOB key format
2015-10-20 23:17:11 -05:00
Andreas Fischer
a88047f242
Merge branch '2.0'
...
* 2.0:
Add test case for GitHub Issue 850: Realpath in SFTP chmod().
Fixed a bug in SFTP::chmod not using realpath on the filepath
2015-10-19 00:19:08 +02:00
Andreas Fischer
1cf70d27e8
Merge branch '1.0' into 2.0
...
* 1.0:
Add test case for GitHub Issue 850: Realpath in SFTP chmod().
Fixed a bug in SFTP::chmod not using realpath on the filepath
2015-10-19 00:19:07 +02:00
Andreas Fischer
579e51c58f
Add test case for GitHub Issue 850: Realpath in SFTP chmod().
2015-10-19 00:07:55 +02:00
terrafrost
ad55d3cd75
RSA: fixes to last non-merge commit
2015-10-16 14:04:17 -05:00
terrafrost
31c14063fa
RSA: updates to raw plugin
2015-10-16 09:36:49 -05:00
terrafrost
177b52088d
Merge branch '2.0'
2015-10-12 23:10:15 -05:00
terrafrost
da1a2df5aa
Merge branch 'getkeylength-2.0-2' into 2.0
2015-10-12 23:09:04 -05:00
terrafrost
666092c889
Merge branch 'getkeylength' into 1.0
2015-10-12 22:59:46 -05:00
terrafrost
cfcf554531
RSA: changes to putty plugin and rm comment methods from rsa etc
2015-10-01 23:11:55 -05:00
terrafrost
fb22529c44
Tests/RSA: add unit test for new functionality
2015-10-01 20:11:11 -05:00
terrafrost
91887c957d
Merge remote-tracking branch 'upstream/master' into rsa-plugins
...
Conflicts:
phpseclib/Crypt/RSA.php
phpseclib/Net/SSH2.php
2015-10-01 15:57:31 -05:00
terrafrost
ec3fe7277b
RSA: move key format handling to plugins
2015-10-01 15:41:11 -05:00
Andreas Fischer
0ba1a04c05
Merge branch '2.0'
...
* 2.0:
SFTP: don't start in local file middle when uploading to middle of the remote file
Tests/SFTP: updates to newly added unit test
SFTP: backport DavidAnderson684's changes to 1.0 branch
add unit test demo'ing issue # 830
2015-09-30 17:28:03 +02:00
terrafrost
0f49fb86bf
Merge branch 'sftp-endless-loop' into sftp-endless-loop-v2
...
Conflicts:
phpseclib/Net/SFTP.php
tests/Functional/Net/SFTPUserStoryTest.php
2015-09-29 21:51:20 -05:00
terrafrost
6688f650f1
SFTP: don't start in local file middle when uploading to middle of
...
the remote file
2015-09-29 21:39:35 -05:00
terrafrost
26ddf02fee
Merge branch 'sftp-endless-loop' into sftp-endless-loop-v2
...
Conflicts:
phpseclib/Net/SFTP.php
2015-09-28 09:20:38 -05:00
terrafrost
759e04f08e
Tests/SFTP: updates to newly added unit test
2015-09-27 10:57:41 -05:00
terrafrost
23db2f7be3
add unit test demo'ing issue # 830
2015-09-27 10:54:08 -05:00
