Commit Graph

3469 Commits

Author SHA1 Message Date
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
8a58f3fcd5 Merge branch '2.0' 2019-03-09 17:25: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
604954cd09 Merge branch '2.0' 2019-03-04 08:16:25 -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
2ddcc1f88a Travis: allow failures on nightly 2019-02-24 22:10:37 -06:00
terrafrost
adc9a5d189 Merge branch '2.0' 2019-02-24 21:37:43 -06:00
terrafrost
926e43af9d
Merge pull request #1344 from bobvandevijver/patch-1
Fixed RSA loadKey type hint
2019-02-24 21:36:40 -06:00
Bob van de Vijver
48b1c87f4c
Fixed RSA loadKey type hint 2019-02-22 10:37:16 +01:00
terrafrost
ef0518a84a Merge branch '2.0' 2019-02-10 17:24:06 -06: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
9e8afe2d78 Merge branch '2.0' 2019-01-27 13:37:47 -06:00
terrafrost
8ebfcadbf3 Merge branch '1.0' into 2.0 2019-01-27 13:37:29 -06:00
terrafrost
7432a6959a 1.0.14 release 2019-01-27 13:35:10 -06:00
terrafrost
590c92b2a1 Merge branch '2.0' 2019-01-20 09:39:44 -06:00
terrafrost
5c5a8a5c09 Merge branch '1.0' into 2.0 2019-01-20 09:39:34 -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