[jdk8u-dev] RFR: 8183107: PKCS11 regression regarding checkKeySize
zzambers
duke at openjdk.org
Thu Aug 11 19:27:37 UTC 2022
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
-------------
Commit messages:
- Backport 67ca52873f088a08705baeef3e66319de1600576
Changes: https://git.openjdk.org/jdk8u-dev/pull/98/files
Webrev: https://webrevs.openjdk.org/?repo=jdk8u-dev&pr=98&range=00
Issue: https://bugs.openjdk.org/browse/JDK-8183107
Stats: 79 lines in 4 files changed: 46 ins; 9 del; 24 mod
Patch: https://git.openjdk.org/jdk8u-dev/pull/98.diff
Fetch: git fetch https://git.openjdk.org/jdk8u-dev pull/98/head:pull/98
PR: https://git.openjdk.org/jdk8u-dev/pull/98
More information about the jdk8u-dev
mailing list