Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from phpseclib:master #195

Open
wants to merge 72 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
7f31a1e
SSH2: make it so phpseclib initiates key re-exchange after 1GB
terrafrost Nov 22, 2024
0b9fd56
Merge branch '1.0' into 2.0
terrafrost Nov 22, 2024
ccf4b48
SSH2: PHP didn't support constant expressions until PHP 5.6
terrafrost Nov 22, 2024
b966aa2
Merge branch '1.0' into 2.0
terrafrost Nov 22, 2024
b38e849
SSH2: don't count len of packets sent / rcvd during key exchange
terrafrost Nov 22, 2024
53645af
Merge branch '1.0' into 2.0
terrafrost Nov 22, 2024
dcd4b2a
Merge branch '2.0' into 3.0
terrafrost Nov 22, 2024
feb12c8
Merge branch '3.0'
terrafrost Nov 22, 2024
7aa66fd
CS adjustments
terrafrost Nov 22, 2024
6f4af7e
SSH2: extra_packets is no longer used
terrafrost Nov 22, 2024
9957287
Merge branch '1.0' into 2.0
terrafrost Nov 22, 2024
614d8ae
Merge branch '2.0' into 3.0
terrafrost Nov 22, 2024
e81fd68
SSH2: rm changes i made for debugging
terrafrost Nov 22, 2024
f388cb1
Merge branch '3.0'
terrafrost Nov 22, 2024
f5113e1
SSH2: rm extra_packets in a few more places
terrafrost Nov 22, 2024
7070529
Merge branch '3.0'
terrafrost Nov 22, 2024
7c56d2c
CS adjustments
terrafrost Nov 22, 2024
b66b5dc
SSH2: replace user_error with Exceptions
terrafrost Nov 23, 2024
5160738
Merge branch '3.0'
terrafrost Nov 23, 2024
b39334b
SSH2: replace \RuntimeException with UnsupportedAlgorithmException
terrafrost Nov 23, 2024
ccac840
Merge branch '3.0'
terrafrost Nov 23, 2024
88fd8e0
run unit tests on PHP 8.3 and 8.4
terrafrost Nov 23, 2024
910927a
Merge branch '1.0' into 2.0
terrafrost Nov 23, 2024
a27023a
Merge branch '2.0' into 3.0
terrafrost Nov 23, 2024
866ae12
Merge branch '3.0'
terrafrost Nov 23, 2024
2b79c06
fix deprecated
dmnlk Nov 26, 2024
57435e2
SSH2: add bytesUntilKeyReexchange() method
terrafrost Nov 28, 2024
6865afb
Merge branch '1.0' into 2.0
terrafrost Nov 28, 2024
8eb3c09
Merge branch '2.0' into 3.0
terrafrost Nov 28, 2024
c38fde1
CS adjustments
terrafrost Nov 28, 2024
49825b8
Merge branch '3.0'
terrafrost Nov 28, 2024
3e27d83
more CS adjustments
terrafrost Nov 28, 2024
181f13a
fix unit tests on PHP 8.3/8.4
terrafrost Nov 28, 2024
3106784
Merge branch '1.0' into 2.0
terrafrost Nov 28, 2024
10a9c2e
Merge branch '2.0' into 3.0
terrafrost Nov 28, 2024
a60ebaf
Merge branch '3.0'
terrafrost Nov 28, 2024
e432117
fix PHP 8.4 deprecations
terrafrost Nov 29, 2024
e6864d4
Merge branch '3.0'
terrafrost Nov 29, 2024
6dcb3bb
X509: fix another PHP 8.4 deprecation
terrafrost Nov 29, 2024
b5d32a8
Merge branch '3.0'
terrafrost Nov 29, 2024
7d1779e
X509: even more PHP 8.4 deprecations
terrafrost Nov 29, 2024
18d71ce
Merge branch '3.0'
terrafrost Nov 29, 2024
e6b4017
Merge pull request #2052 from dmnlk/feature/php84-compatible
terrafrost Nov 29, 2024
58709cf
RSA: PHP 8.4 deprecated xml_set_object()
terrafrost Nov 29, 2024
05085f4
BigInteger: fix for PHP 8.4.0 - 8.4.1 regression
terrafrost Nov 29, 2024
ca7ae97
Merge branch '1.0' into 2.0
terrafrost Nov 29, 2024
7127d93
Merge branch '2.0' into 3.0
terrafrost Nov 29, 2024
faced4d
Merge branch '3.0'
terrafrost Nov 29, 2024
46c3756
SSH2: fix PHP 8.4 deprecatin w.r.t. declare(strict_types=1)
terrafrost Nov 29, 2024
8de7a89
BigInteger: improve detection of newly introduced GMP bug
terrafrost Nov 29, 2024
702bd33
Merge branch '1.0' into 2.0
terrafrost Nov 29, 2024
ad709d8
Merge branch '2.0' into 3.0
terrafrost Nov 29, 2024
eefcfdd
Merge branch '3.0'
terrafrost Nov 29, 2024
5cadfba
Merge branch 'master' of https://github.com/phpseclib/phpseclib
terrafrost Nov 29, 2024
2914a15
Tests/X509: add testRSACertWithECSDASig unit test
terrafrost Dec 4, 2024
7b43ea0
X509: algorithmidentifier parameters could get incorrectly set
terrafrost Nov 29, 2024
83978e6
Tests/CSR: update testNewCSR() test
terrafrost Dec 4, 2024
fc5b4b3
CS adjustments
terrafrost Dec 4, 2024
1f7937f
Merge branch '3.0'
terrafrost Dec 4, 2024
573f4aa
SFTP: fix possible SFTPv3 error when rcving date only attributes
terrafrost Dec 4, 2024
487bfa2
Merge branch '3.0'
terrafrost Dec 4, 2024
0efd317
EC/BaseCurves/Montgomery: fix needless conversion in multiplyPoint
terrafrost Dec 4, 2024
ff82c80
Merge branch '3.0'
terrafrost Dec 4, 2024
80c7ee9
unset($block);
jmarchan-ByTel Dec 2, 2024
58e9e43
Merge branch '3.0'
terrafrost Dec 4, 2024
2fe0eab
SSH2: ignore kex-strict-s-v00@openssh.com in key re-exchanges
terrafrost Dec 7, 2024
0a14273
Merge branch '1.0' into 2.0
terrafrost Dec 7, 2024
b59d7be
Merge branch '2.0' into 3.0
terrafrost Dec 7, 2024
c6c89a6
Merge branch '3.0'
terrafrost Dec 7, 2024
eaa7be7
CHANGELOG: add 2.0.48 release
terrafrost Dec 14, 2024
709ec10
Merge branch '2.0' into 3.0
terrafrost Dec 14, 2024
17b0998
Merge branch '3.0'
terrafrost Dec 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
X509: algorithmidentifier parameters could get incorrectly set
  • Loading branch information
terrafrost committed Dec 4, 2024
commit 7b43ea0d2f4b3a76bb054d6083a894d422ffac3f
10 changes: 4 additions & 6 deletions phpseclib/File/X509.php
Original file line number Diff line number Diff line change
@@ -519,11 +519,6 @@ public function saveX509(array $cert, $format = self::FORMAT_PEM)
);
}

if ($algorithm == 'rsaEncryption') {
$cert['signatureAlgorithm']['parameters'] = null;
$cert['tbsCertificate']['signature']['parameters'] = null;
}

$filters = [];
$type_utf8_string = ['type' => ASN1::TYPE_UTF8_STRING];
$filters['tbsCertificate']['signature']['parameters'] = $type_utf8_string;
@@ -2994,7 +2989,10 @@ private static function identifySignatureAlgorithm(PrivateKey $key)
case 'sha256':
case 'sha384':
case 'sha512':
return ['algorithm' => $key->getHash() . 'WithRSAEncryption'];
return [
'algorithm' => $key->getHash() . 'WithRSAEncryption',
'parameters' => null
];
}
throw new UnsupportedAlgorithmException('The only supported hash algorithms for RSA are: md2, md5, sha1, sha224, sha256, sha384, sha512');
}