archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8215769: Java cannot probe pkcs12 files exported by Firefox

Browse source 
Reviewed-by: mullan
This commit is contained in:
Weijun Wang 2018-12-22 10:38:45 +08:00
parent fedf0767fc
commit 4769c9fbad
2 changed files with 129 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
View file

@ -2525,6 +2525,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
/*
* PKCS12 permitted first 24 bytes:
*
* 30 80 02 01 03 30 80 06 09 2A 86 48 86 F7 0D 01 07 01 A0 80 24 80 04 --
* 30 82 -- -- 02 01 03 30 82 -- -- 06 09 2A 86 48 86 F7 0D 01 07 01 A0 8-
* 30 -- 02 01 03 30 -- 06 09 2A 86 48 86 F7 0D 01 07 01 A0 -- 04 -- -- --
* 30 81 -- 02 01 03 30 81 -- 06 09 2A 86 48 86 F7 0D 01 07 01 A0 81 -- 04
@ -2536,6 +2537,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
*/
private static final long[][] PKCS12_HEADER_PATTERNS = {
{ 0x3080020103308006L, 0x092A864886F70D01L, 0x0701A08024800400L },
{ 0x3082000002010330L, 0x82000006092A8648L, 0x86F70D010701A080L },
{ 0x3000020103300006L, 0x092A864886F70D01L, 0x0701A00004000000L },
{ 0x3081000201033081L, 0x0006092A864886F7L, 0x0D010701A0810004L },
@ -2547,6 +2549,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
};
private static final long[][] PKCS12_HEADER_MASKS = {
{ 0xFFFFFFFFFFFFFFFFL, 0xFFFFFFFFFFFFFFFFL, 0xFFFFFFFFFFFFFF00L },
{ 0xFFFF0000FFFFFFFFL, 0xFF0000FFFFFFFFFFL, 0xFFFFFFFFFFFFFFF0L },
{ 0xFF00FFFFFFFF00FFL, 0xFFFFFFFFFFFFFFFFL, 0xFFFFFF00FF000000L },
{ 0xFFFF00FFFFFFFFFFL, 0x00FFFFFFFFFFFFFFL, 0xFFFFFFFFFFFF00FFL },