mirror of
https://github.com/openjdk/jdk.git
synced 2026-03-24 06:40:05 +00:00
8336240: Test com/sun/crypto/provider/Cipher/DES/PerformanceTest.java fails with java.lang.ArithmeticException
Reviewed-by: wetmore
This commit is contained in:
parent
abc4ca5a8c
commit
034297a6bd
@ -606,7 +606,6 @@ sun/security/smartcardio/TestExclusive.java 8039280 generic-
|
||||
sun/security/smartcardio/TestMultiplePresent.java 8039280 generic-all
|
||||
sun/security/smartcardio/TestPresent.java 8039280 generic-all
|
||||
sun/security/smartcardio/TestTransmit.java 8039280 generic-all
|
||||
com/sun/crypto/provider/Cipher/DES/PerformanceTest.java 8039280 generic-all
|
||||
com/sun/security/auth/callback/TextCallbackHandler/Password.java 8039280 generic-all
|
||||
com/sun/security/sasl/gsskerb/AuthOnly.java 8039280 generic-all
|
||||
com/sun/security/sasl/gsskerb/ConfSecurityLayer.java 8039280 generic-all
|
||||
|
||||
@ -621,7 +621,6 @@ jdk_core_manual_no_input = \
|
||||
|
||||
jdk_security_manual_no_input = \
|
||||
:jdk_security_infra \
|
||||
com/sun/crypto/provider/Cipher/DES/PerformanceTest.java \
|
||||
com/sun/crypto/provider/Cipher/AEAD/GCMIncrementByte4.java \
|
||||
com/sun/crypto/provider/Cipher/AEAD/GCMIncrementDirect4.java \
|
||||
com/sun/security/auth/callback/TextCallbackHandler/Password.java \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2024, 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
|
||||
@ -26,11 +26,8 @@
|
||||
* @bug 0000000
|
||||
* @summary This test checks performance of various ciphers.
|
||||
* @author Jan Luehe
|
||||
* @run main/manual PerformanceTest
|
||||
*/
|
||||
import java.security.*;
|
||||
import java.security.spec.*;
|
||||
import java.io.*;
|
||||
import javax.crypto.*;
|
||||
import javax.crypto.spec.*;
|
||||
|
||||
@ -178,14 +175,16 @@ public class PerformanceTest {
|
||||
long start, end;
|
||||
cipher.init(Cipher.ENCRYPT_MODE, cipherKey, params);
|
||||
|
||||
start = System.currentTimeMillis();
|
||||
start = getTimeInMicroseconds();
|
||||
for (int i=0; i<count-1; i++) {
|
||||
cipher.update(data, 0, data.length);
|
||||
}
|
||||
cipher.doFinal(data, 0, data.length);
|
||||
end = System.currentTimeMillis();
|
||||
end = getTimeInMicroseconds();
|
||||
|
||||
int speed = (int)((data.length * count)/(end - start));
|
||||
// To avoid dividing by zero in the rare case where end is equal to start
|
||||
long executionTime = end != start ? end - start : 1L;
|
||||
int speed = (int) ((data.length * count) / executionTime);
|
||||
sum += speed;
|
||||
col.append(speed);
|
||||
}
|
||||
@ -198,8 +197,12 @@ public class PerformanceTest {
|
||||
System.out.println
|
||||
("=========================================================");
|
||||
System.out.println
|
||||
("Algorithm DataSize Rounds Kbytes/sec");
|
||||
("Algorithm DataSize Rounds Bytes/microsec");
|
||||
|
||||
}
|
||||
|
||||
private static long getTimeInMicroseconds() {
|
||||
return System.nanoTime() / 1000;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user