On Tue, 16 Nov 2021 01:07:55 GMT, Weijun Wang <[email protected]> wrote:
>> When a signature/digest algorithm was being checked, the algorithm
>> constraints checked both the signature/digest algorithm and the key to see
>> if they were restricted. This caused duplicate checks and was also
>> problematic for `jarsigner` (and `keytool`) which need to distinguish these
>> two cases, so that the output can properly indicate when the key is disabled
>> but the signature or digest alg is ok.
>>
>> To address this issue, a new `checkKey` parameter is added to the
>> `DisabledAlgorithmConstraints.permits` methods. When `true` the key (alg and
>> size) is also checked, otherwise it is not. This flag is always set to
>> `false` by `jarsigner` when checking algs and by the JDK when checking
>> digest algorithms. Other small changes include changes in `SignerInfo` to
>> use a record to store info about the algorithms to be checked, and removing
>> an unnecessary CRL checking method from `AlgorithmChecker`.
>>
>> `keytool` will be enhanced in a subsequent CR to call the new methods.
>
> src/java.base/share/classes/sun/security/pkcs/SignerInfo.java line 749:
>
>> 747: Set<String> enabledAlgorithms = new HashSet<>();
>> 748: try {
>> 749: for (Map.Entry<AlgorithmId, AlgorithmInfo> algorithm :
>
> You can use `var`.
Yes.
> test/jdk/sun/security/tools/jarsigner/TimestampCheck.java line 368:
>
>> 366: .shouldNotContain("The SHA-256 algorithm
>> specified " +
>> 367: "for the -tsadigestalg option is considered
>> a " +
>> 368: "security risk and is disabled")
>
> Maybe just check `.shouldNotContain("option is considered a security risk and
> is disabled")`?
Ok
-------------
PR: https://git.openjdk.java.net/jdk/pull/6296
