From ef9b6ed5c30316400cbd67f3945008333512d766 Mon Sep 17 00:00:00 2001
From: Valerie Peng <valeriep@openjdk.org>
Date: Wed, 7 Aug 2019 20:46:28 +0000
Subject: [PATCH] 8229214: Don't use GCM with PKCS5Padding in
 test/micro/org/openjdk/bench/javax/crypto/

Update AESGCMBench.java and CipherBench.java accordingly

Reviewed-by: xuelei, ecaspole
---
 .../org/openjdk/bench/javax/crypto/full/AESGCMBench.java      | 4 ++--
 .../org/openjdk/bench/javax/crypto/full/CipherBench.java      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/micro/org/openjdk/bench/javax/crypto/full/AESGCMBench.java b/test/micro/org/openjdk/bench/javax/crypto/full/AESGCMBench.java
index 80fbe569205..1166d28d765 100644
--- a/test/micro/org/openjdk/bench/javax/crypto/full/AESGCMBench.java
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/AESGCMBench.java
@@ -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 @@ import java.security.spec.InvalidParameterSpecException;
 
 public class AESGCMBench extends CryptoBase {
 
-    @Param({"AES/GCM/NoPadding","AES/GCM/PKCS5Padding"})
+    @Param({"AES/GCM/NoPadding"})
     private String algorithm;
 
     @Param({"128"})
diff --git a/test/micro/org/openjdk/bench/javax/crypto/full/CipherBench.java b/test/micro/org/openjdk/bench/javax/crypto/full/CipherBench.java
index 10836abe4f4..56ece911a85 100644
--- a/test/micro/org/openjdk/bench/javax/crypto/full/CipherBench.java
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/CipherBench.java
@@ -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 @@ public abstract class CipherBench extends CryptoBase {
         @Param({"GCM"})
         private String mode;
 
-        @Param({"NoPadding", "PKCS5Padding"})
+        @Param({"NoPadding"})
         private String padding;
 
         @Param({"128", "256"})