infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-08-03 22:55:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

8377833: Enhance Jar file processing

Browse Source 
Reviewed-by: ahgross, rhalade, hchao, mullan
This commit is contained in:
Weijun Wang 2026-03-17 21:03:49 +00:00 committed by bchristi
parent a8834d6dd0
commit 0203dcff4b
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java.base/share/classes/java/util/jar/JarVerifier.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2026, 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
@ -68,7 +68,7 @@ class JarVerifier {
private ArrayList<SignatureFileVerifier> pendingBlocks;
/* cache of CodeSigner objects */
private ArrayList<CodeSigner[]> signerCache;
private List<CodeSigner[]> signerCache;
/* Are we parsing a block? */
private boolean parsingBlockOrSF = false;
@ -288,7 +288,7 @@ class JarVerifier {
String key = uname.substring(0, uname.lastIndexOf('.'));
if (signerCache == null)
signerCache = new ArrayList<>();
signerCache = new LinkedList<>();
if (manDig == null) {
synchronized(manifestRawBytes) {

15
src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2026, 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
@ -46,7 +46,12 @@ public class SignatureFileVerifier {
/* Are we debugging ? */
private static final Debug debug = Debug.getInstance("jar");
private final ArrayList<CodeSigner[]> signerCache;
private final List<CodeSigner[]> signerCache;
// The maximum size of the signerCache. This is for debug only
// and not intended to be adjusted by users.
private static int SIGNER_CACHE_SIZE
= Integer.getInteger("sun.security.util.jar.signer.cache.size", 5);
private static final String ATTR_DIGEST =
"-DIGEST-" + ManifestDigester.MF_MAIN_ATTRS.toUpperCase(Locale.ENGLISH);
@ -97,7 +102,7 @@ public class SignatureFileVerifier {
*
* @param rawBytes the raw bytes of the signature block file
*/
public SignatureFileVerifier(ArrayList<CodeSigner[]> signerCache,
public SignatureFileVerifier(List<CodeSigner[]> signerCache,
ManifestDigester md,
String name,
byte[] rawBytes)
@ -282,7 +287,6 @@ public class SignatureFileVerifier {
} finally {
Providers.stopJarVerification(obj);
}
}
private void processImpl(Hashtable<String, CodeSigner[]> signers,
@ -850,6 +854,9 @@ public class SignatureFileVerifier {
newSigners.length);
}
signerCache.add(cachedSigners);
if (signerCache.size() > SIGNER_CACHE_SIZE) {
signerCache.remove(0);
}
signers.put(name, cachedSigners);
}