octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-06-20 01:02:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,772 Commits 4 Branches 117 Tags 19 MiB
f199a0cfe9
Commit Graph

887 Commits

Author SHA1 Message Date
terrafrost
32e85c2145 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2022-08-13 16:52:58 -05:00
terrafrost
1d04f9b1d4 Merge branch 'callmejon' 2022-08-13 09:05:30 -05:00
terrafrost
259f44207a
Merge pull request #1824 from jack-worman/Php_7.3 
Php 7.3 php-cs-fixer rule and composer.json scripts
 2022-07-31 23:43:07 -05:00
terrafrost
2e549e3aa1 Merge branch '3.0' 2022-07-31 17:28:30 -05:00
terrafrost
826d8d6670 make it so OpenSSH encrypted keys can be created 2022-07-31 17:14:20 -05:00
terrafrost
3691aefd2b CS adjustments 2022-07-31 08:48:04 -05:00
terrafrost
69d3f8548a Merge branch 'bcrypt3' 2022-07-30 19:49:05 -05:00
terrafrost
1e10a6ab7a fix bad merge 2022-07-30 18:51:45 -05:00
terrafrost
450a961785 Merge branch 'bcrypt2' into bcrypt3 2022-07-30 18:07:26 -05:00
terrafrost
11977eeb3c Merge branch 'bcrypt' into bcrypt2 2022-07-28 16:55:43 -05:00
terrafrost
34a277ff16 a few small tweaks 2022-07-28 16:44:29 -05:00
Jonny Fonsato
5411695c0b
changed as mentioned by Terrafrost 2022-07-28 16:38:51 +02:00
terrafrost
0c8994bbad Crypt/RSA: add support for loading OpenSSH encrypted keys 2022-07-28 08:11:42 -05:00
Jack Worman
510a93a50a Php 7.3 
- Update php requirement to >=7.3
- Add php-cs-fixer rule: @PHP73Migration
 2022-07-22 21:45:53 -05:00
terrafrost
a95abeb4c4 Merge remote-tracking branch 'jworman/Php_7.1' 2022-07-22 18:29:53 -05:00
terrafrost
a9c3f10de4 Merge branch '3.0' 2022-07-15 09:18:37 -05:00
terrafrost
feced404bb EC/PKCS8: OpenSSL didn't like phpseclib formed Ed25519 public keys 2022-07-15 09:18:15 -05:00
Jack Worman
7154fd98d2 Php 7.1 2022-07-08 21:42:28 -05:00
Jack Worman
e210166f43 Php 7.1 Upgrade 2022-07-08 08:37:58 -05:00
Jack Worman
81ffdbc4ef Merge branch 'master' into Upgrade_to_Php_7.0 
# Conflicts:
#	phpseclib/Crypt/EC/BaseCurves/Prime.php
#	phpseclib/Crypt/EC/Formats/Keys/XML.php
#	phpseclib/Crypt/RSA/PrivateKey.php
#	phpseclib/File/ANSI.php
#	phpseclib/File/ASN1.php
#	phpseclib/File/X509.php
#	phpseclib/Net/SFTP.php
#	phpseclib/Net/SFTP/Stream.php
#	phpseclib/Net/SSH2.php
#	phpseclib/System/SSH/Agent.php
#	phpseclib/System/SSH/Agent/Identity.php
#	tests/Unit/Math/BigInteger/TestCase.php
 2022-07-03 07:48:16 -05:00
terrafrost
30e845ff1a Merge branch '3.0' 2022-07-02 21:50:18 -05:00
terrafrost
1fd995abdf Merge branch '3.0-type-hinting-backport' into 3.0 2022-07-02 21:49:55 -05:00
terrafrost
250f1a5b51 more backporting 2022-07-02 21:49:45 -05:00
Jack Worman
97902d4bd3 Upgrade to PHP 7.0 2022-07-02 16:26:15 -05:00
terrafrost
d124f95ea3 Merge branch '3.0' 2022-06-26 17:21:55 -05:00
terrafrost
9e77203746 Tests/BigInteger: make unit test do == vs === 2022-06-26 17:16:17 -05:00
terrafrost
5f137d60ec Tests/ASN1Test: update tests to work with decodeBER returning null 2022-06-22 07:57:03 -05:00
terrafrost
2b36a0fcd7 Merge branch '3.0' 2022-05-10 23:16:48 -05:00
terrafrost
2e963c0002 Tests/BigInteger: fix 8.2 deprecation errors 2022-05-10 23:08:46 -05:00
terrafrost
b4e20843c8 Merge branch '3.0' 2022-04-22 18:50:55 -05:00
Jack Worman
746e9eef57 Clean Up Tests 2022-04-22 18:41:59 -05:00
terrafrost
3e073a59e0 Merge branch '3.0' 2022-03-15 18:56:04 -05:00
Jack Worman
0a69972571 Clean Up Tests 2022-03-15 18:49:38 -05:00
terrafrost
b722a4f002 Merge branch '3.0' 2022-03-08 08:53:21 -06:00
Jack Worman
46758107de GitHub actions 2022-03-08 06:08:01 -06:00
terrafrost
6a6e80ba8f Merge branch '3.0' 2022-02-27 01:40:25 -06:00
Jack Worman
574953061a PSR4 for tests and added fall-through for switches 
PSR4 for tests and added fall-through for switches
 2022-02-27 01:26:31 -06:00
terrafrost
004aec954f Merge branch '3.0' 2022-02-19 18:08:40 -06:00
Jack Worman
ea9f6540f3 PSR12 fixes 
PSR12 fixes
 2022-02-19 17:06:13 -06:00
terrafrost
7cbd239124 Merge branch '3.0' 2022-02-17 08:22:56 -06:00
terrafrost
9f6af761b0 Merge branch '2.0' into 3.0 2022-02-17 08:19:47 -06:00
terrafrost
019b4ffd3a Merge branch '1.0' into 2.0 2022-02-17 00:35:01 -06:00
terrafrost
45d2ddcbc4 RSA: add support for loading PuTTY v3 keys 2022-02-17 00:32:21 -06:00
terrafrost
e2f9d10660 Merge branch '3.0' 2022-02-14 21:19:59 -06:00
terrafrost
5bc572e2ce EC/PKCS8: OpenSSL didn't like phpseclib formed Ed25519 private keys 
Tested with openssl pkey -in private.pem -pubout -text on
OpenSSL 1.1.1f 31 Mar 2020
 2022-02-14 21:15:36 -06:00
terrafrost
c233a385cc Merge branch '3.0' 2022-02-14 19:34:16 -06:00
terrafrost
f5858a6a1d Tests/RSA: add test for changing PKCS8 encryption parameters 2022-02-14 19:25:13 -06:00
terrafrost
b2b5e54afe Merge branch '3.0' 2022-02-08 20:37:20 -06:00
terrafrost
f96f3505a8 Hash: add support for keccak256 2022-02-08 20:34:17 -06:00
terrafrost
30eeb49583 Merge branch '3.0' 2022-02-04 10:39:04 -06:00