diff --git a/kae-phase2.patch b/kae-phase2.patch
index e0c1c43bec2822397ab85edbefd71921f1576573..0717b274e592b9adf25250913ac8c37addbef25e 100644
--- a/kae-phase2.patch
+++ b/kae-phase2.patch
@@ -3756,8 +3756,8 @@ index 00000000..897e2c6b
 +        } catch (ArrayIndexOutOfBoundsException | BadPaddingException e) {
 +            if (e instanceof AEADBadTagException) {
 +                throw e; // AEADBadTagException is expected for some tests
-+            } else if (e instanceof BadPaddingException || e.getMessage().contains("wrong final block length")) {
-+                if (padding == Padding.NOPADDING) {
++            } else if (e instanceof BadPaddingException) {
++                if (padding == Padding.NOPADDING || e.getMessage().contains("wrong final block length")) {
 +                    throw new IllegalBlockSizeException("Input length not multiple of " + blockSize + " bytes");
 +                } else {
 +                    throw e;
diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec
index 1286486b0cd6f4e77681aeead314715224965313..fd94d71ecd9f063a5dd89453d06915075d203e72 100644
--- a/openjdk-1.8.0.spec
+++ b/openjdk-1.8.0.spec
@@ -918,7 +918,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}.%{buildver}
-Release: 7
+Release: 8
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
 # and this change was brought into RHEL-4. java-1.5.0-ibm packages
 # also included the epoch in their virtual provides. This created a
@@ -2174,6 +2174,9 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Tue Jun 8 2021 noah <hedongbo@huawei.com> - 1:1.8.0.292-b10.8
+- fix kae exception compatibility
+
 * Tue Jun 8 2021 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.292-b10.7
 - add improve_algorithmConstraints_checkAlgorithm_performance.patch