Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorvaleriep
Wed, 07 Aug 2019 20:47:43 +0000
changeset 57674 4e3a26572bb6
parent 57673 24f1a593dcd0 (diff)
parent 57672 167cb7b4cd81 (current diff)
child 57678 b948b920e29f
Merge
--- a/test/micro/org/openjdk/bench/javax/crypto/full/AESGCMBench.java	Wed Aug 07 17:00:19 2019 +0800
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/AESGCMBench.java	Wed Aug 07 20:47:43 2019 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -40,7 +40,7 @@
 
 public class AESGCMBench extends CryptoBase {
 
-    @Param({"AES/GCM/NoPadding","AES/GCM/PKCS5Padding"})
+    @Param({"AES/GCM/NoPadding"})
     private String algorithm;
 
     @Param({"128"})
--- a/test/micro/org/openjdk/bench/javax/crypto/full/CipherBench.java	Wed Aug 07 17:00:19 2019 +0800
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/CipherBench.java	Wed Aug 07 20:47:43 2019 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -122,7 +122,7 @@
         @Param({"GCM"})
         private String mode;
 
-        @Param({"NoPadding", "PKCS5Padding"})
+        @Param({"NoPadding"})
         private String padding;
 
         @Param({"128", "256"})
jdk-sandbox