8151834: Test SmallPrimeExponentP.java times out intermittently
Reviewed-by: weijun
This commit is contained in:
parent
96608b3717
commit
55101b0096
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -21,6 +21,18 @@
|
|||||||
* questions.
|
* questions.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @test
|
||||||
|
* @bug 8023546 8151834
|
||||||
|
* @modules java.base/sun.security.x509
|
||||||
|
* java.base/sun.security.tools.keytool
|
||||||
|
* @summary Test prime exponent (p) lengths 63 and 65 bytes with SunMSCAPI.
|
||||||
|
* The seed 76 has the fastest test execution now (only 5 rounds) and is
|
||||||
|
* hard-coded in run tag. This number might change if algorithms for
|
||||||
|
* RSA key pair generation or BigInteger prime searching gets updated.
|
||||||
|
* @requires os.family == "windows"
|
||||||
|
* @run main SmallPrimeExponentP 76
|
||||||
|
*/
|
||||||
import sun.security.tools.keytool.CertAndKeyGen;
|
import sun.security.tools.keytool.CertAndKeyGen;
|
||||||
import sun.security.x509.X500Name;
|
import sun.security.x509.X500Name;
|
||||||
|
|
||||||
@ -28,50 +40,63 @@ import java.security.KeyStore;
|
|||||||
import java.security.SecureRandom;
|
import java.security.SecureRandom;
|
||||||
import java.security.cert.X509Certificate;
|
import java.security.cert.X509Certificate;
|
||||||
import java.security.interfaces.RSAPrivateCrtKey;
|
import java.security.interfaces.RSAPrivateCrtKey;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
/*
|
|
||||||
* @test
|
|
||||||
* @bug 8023546
|
|
||||||
* @key intermittent
|
|
||||||
* @modules java.base/sun.security.x509
|
|
||||||
* java.base/sun.security.tools.keytool
|
|
||||||
* @summary sun/security/mscapi/ShortRSAKey1024.sh fails intermittently
|
|
||||||
* @requires os.family == "windows"
|
|
||||||
*/
|
|
||||||
public class SmallPrimeExponentP {
|
public class SmallPrimeExponentP {
|
||||||
|
|
||||||
public static void main(String argv[]) throws Exception {
|
public static void main(String argv[]) throws Exception {
|
||||||
|
|
||||||
String osName = System.getProperty("os.name");
|
long seed = Long.parseLong(argv[0]);
|
||||||
if (!osName.startsWith("Windows")) {
|
System.out.println("Seed for SecureRandom = " + seed + "L");
|
||||||
System.out.println("Not windows");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
KeyStore ks = KeyStore.getInstance("Windows-MY");
|
KeyStore ks = KeyStore.getInstance("Windows-MY");
|
||||||
ks.load(null, null);
|
ks.load(null, null);
|
||||||
|
|
||||||
CertAndKeyGen ckg = new CertAndKeyGen("RSA", "SHA1withRSA");
|
CertAndKeyGen ckg = new CertAndKeyGen("RSA", "SHA1withRSA");
|
||||||
ckg.setRandom(new SecureRandom());
|
ckg.setRandom(new MySecureRandom(seed));
|
||||||
boolean see63 = false, see65 = false;
|
|
||||||
|
boolean see63 = false;
|
||||||
|
boolean see65 = false;
|
||||||
while (!see63 || !see65) {
|
while (!see63 || !see65) {
|
||||||
ckg.generate(1024);
|
ckg.generate(1024);
|
||||||
RSAPrivateCrtKey k = (RSAPrivateCrtKey) ckg.getPrivateKey();
|
RSAPrivateCrtKey k = (RSAPrivateCrtKey) ckg.getPrivateKey();
|
||||||
|
|
||||||
int len = k.getPrimeExponentP().toByteArray().length;
|
int len = k.getPrimeExponentP().toByteArray().length;
|
||||||
|
System.out.println("Length of P = " + len);
|
||||||
if (len == 63 || len == 65) {
|
if (len == 63 || len == 65) {
|
||||||
if (len == 63) {
|
if (len == 63) {
|
||||||
if (see63) continue;
|
if (see63) {
|
||||||
else see63 = true;
|
continue;
|
||||||
|
} else {
|
||||||
|
see63 = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (len == 65) {
|
if (len == 65) {
|
||||||
if (see65) continue;
|
if (see65) {
|
||||||
else see65 = true;
|
continue;
|
||||||
|
} else {
|
||||||
|
see65 = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
System.err.print(len);
|
|
||||||
ks.setKeyEntry("anything", k, null, new X509Certificate[]{
|
ks.setKeyEntry("anything", k, null, new X509Certificate[]{
|
||||||
ckg.getSelfCertificate(new X500Name("CN=Me"), 1000)
|
ckg.getSelfCertificate(new X500Name("CN=Me"), 1000)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
System.err.print('.');
|
|
||||||
}
|
}
|
||||||
ks.store(null, null);
|
ks.store(null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static class MySecureRandom extends SecureRandom {
|
||||||
|
|
||||||
|
final Random random;
|
||||||
|
|
||||||
|
public MySecureRandom(long seed) {
|
||||||
|
random = new Random(seed);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void nextBytes(byte[] bytes) {
|
||||||
|
random.nextBytes(bytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user