[jdk8u-dev] RFR: 8183107: PKCS11 regression regarding checkKeySize

[Paul Hohensee]

On Thu, 11 Aug 2022 18:19:35 GMT, zzambers <duke at openjdk.org> wrote:

> This is backport of JDK-8183107 [1]. When dealt with different paths on jdk8, patch extracted from jdk project applied cleanly except for copyright line P11Signature.java file, which already has newer year then what is in changest (so this change is excluded).
> 
> git apply -p3 --directory=jdk/src --reject 0001-8183107-PKCS11-regression-regarding-checkKeySize.patch
> Checking patch jdk/src/share/classes/sun/security/pkcs11/P11KeyGenerator.java...
> Checking patch jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java...
> Checking patch jdk/src/share/classes/sun/security/pkcs11/P11Signature.java...
> error: while searching for:
> /*
>  * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
>  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>  *
>  * This code is free software; you can redistribute it and/or modify it
> 
> error: patch failed: jdk/src/share/classes/sun/security/pkcs11/P11Signature.java:1
> Hunk #2 succeeded at 370 (offset -24 lines).
> Hunk #3 succeeded at 396 (offset -24 lines).
> Checking patch jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java...
> Applied patch jdk/src/share/classes/sun/security/pkcs11/P11KeyGenerator.java cleanly.
> Applied patch jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java cleanly.
> Applying patch jdk/src/share/classes/sun/security/pkcs11/P11Signature.java with 1 reject...
> Rejected hunk #1.
> Hunk #2 applied cleanly.
> Hunk #3 applied cleanly.
> Applied patch jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java cleanly.
> 
> 
> Tested locally, no regressions seen in jdk_security tests.
> This backport is done with intention of later also backporting JDK-8232950 [2], which depends on this one.
> 
> [1] https://bugs.openjdk.org/browse/JDK-8183107
> [2] https://bugs.openjdk.org/browse/JDK-8232950

Lgtm.

-------------

Marked as reviewed by phh (Reviewer).

PR: https://git.openjdk.org/jdk8u-dev/pull/98