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

8229775: Incorrect warning when jar was signed with -sectionsonly

Browse source 
Reviewed-by: mullan
This commit is contained in:
Weijun Wang 2019-08-16 08:42:09 +08:00
parent 63baaf7a56
commit b84ffae32f
2 changed files with 63 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
View file

@ -685,6 +685,12 @@ public class Main {
Vector<JarEntry> entriesVec = new Vector<>();
byte[] buffer = new byte[8192];
String suffix1 = "-Digest-Manifest";
String suffix2 = "-Digest-" + ManifestDigester.MF_MAIN_ATTRS;
int suffixLength1 = suffix1.length();
int suffixLength2 = suffix2.length();
Enumeration<JarEntry> entries = jf.entries();
while (entries.hasMoreElements()) {
JarEntry je = entries.nextElement();
@ -701,9 +707,14 @@ public class Main {
boolean found = false;
for (Object obj : sf.getMainAttributes().keySet()) {
String key = obj.toString();
if (key.endsWith("-Digest-Manifest")) {
digestMap.put(alias,
key.substring(0, key.length() - 16));
if (key.endsWith(suffix1)) {
digestMap.put(alias, key.substring(
0, key.length() - suffixLength1));
found = true;
break;
} else if (key.endsWith(suffix2)) {
digestMap.put(alias, key.substring(
0, key.length() - suffixLength2));
found = true;
break;
}

49
test/jdk/sun/security/tools/jarsigner/SectionsOnly.java Normal file
View file

@ -0,0 +1,49 @@
/*
* Copyright (c) 2019, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8229775
* @summary Incorrect warning when jar was signed with -sectionsonly
* @library /test/lib
*/
import jdk.test.lib.SecurityTools;
import jdk.test.lib.util.JarUtils;
import java.nio.file.Files;
import java.nio.file.Path;
public class SectionsOnly {
public static void main(String[] args) throws Exception {
String common = "-storepass changeit -keypass changeit -keystore ks ";
SecurityTools.keytool(common
+ "-keyalg rsa -genkeypair -alias me -dname CN=Me");
JarUtils.createJarFile(Path.of("so.jar"), Path.of("."),
Files.write(Path.of("so.txt"), new byte[0]));
SecurityTools.jarsigner(common + "-sectionsonly so.jar me");
SecurityTools.jarsigner(common + "-verify -verbose so.jar")
.shouldNotContain("Unparsable signature-related file")
.shouldHaveExitValue(0);
}
}