From d36f81468dca8abaf283614e50990b4029546bb5 Mon Sep 17 00:00:00 2001 From: noah Date: Tue, 8 Jun 2021 20:09:13 +0800 Subject: [PATCH] I3UWQT: fix kae exception compatibility --- kae-phase2.patch | 4 ++-- openjdk-1.8.0.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kae-phase2.patch b/kae-phase2.patch index e0c1c43..0717b27 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 1286486..fd94d71 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 - 1:1.8.0.292-b10.8 +- fix kae exception compatibility + * Tue Jun 8 2021 kuenking111 - 1:1.8.0.292-b10.7 - add improve_algorithmConstraints_checkAlgorithm_performance.patch -- Gitee