1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8214937: sun/security/tools/jarsigner/warnings/NoTimestampTest.java failed due to unexpected expiration date

Browse Source 
Reviewed-by: xuelei
This commit is contained in:
John Jiang 2018-12-13 12:34:35 +08:00
parent 3d9ab36ca0
commit 017c702b8a
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/jdk/sun/security/tools/jarsigner/warnings/NoTimestampTest.java
View File

@ -21,8 +21,13 @@
* questions. * questions.
*/ */
import java.io.FileInputStream;
import java.io.InputStream;
import java.security.KeyStore;
import java.security.cert.X509Certificate;
import java.util.Date; import java.util.Date;
import java.util.Locale; import java.util.Locale;
import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.util.JarUtils; import jdk.test.lib.util.JarUtils;
@ -61,16 +66,14 @@ public class NoTimestampTest extends Test {
Utils.createFiles(FIRST_FILE); Utils.createFiles(FIRST_FILE);
JarUtils.createJar(UNSIGNED_JARFILE, FIRST_FILE); JarUtils.createJar(UNSIGNED_JARFILE, FIRST_FILE);
// calculate certificate expiration date
Date expirationDate = new Date(System.currentTimeMillis() + VALIDITY
* 24 * 60 * 60 * 1000L);
// create key pair // create key pair
createAlias(CA_KEY_ALIAS); createAlias(CA_KEY_ALIAS);
createAlias(KEY_ALIAS); createAlias(KEY_ALIAS);
issueCert(KEY_ALIAS, issueCert(KEY_ALIAS,
"-validity", Integer.toString(VALIDITY)); "-validity", Integer.toString(VALIDITY));
Date expirationDate = getCertExpirationDate();
// sign jar file // sign jar file
OutputAnalyzer analyzer = jarsigner( OutputAnalyzer analyzer = jarsigner(
"-J-Duser.timezone=" + timezone, "-J-Duser.timezone=" + timezone,
@ -114,4 +117,12 @@ public class NoTimestampTest extends Test {
System.out.println("Test passed"); System.out.println("Test passed");
} }
private static Date getCertExpirationDate() throws Exception {
KeyStore ks = KeyStore.getInstance("JKS");
try (InputStream in = new FileInputStream(KEYSTORE)) {
ks.load(in, PASSWORD.toCharArray());
}
X509Certificate cert = (X509Certificate) ks.getCertificate(KEY_ALIAS);
return cert.getNotAfter();
}
} }