packages/openjdk-1.8.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I3UWQT: fix kae exception compatibility

Browse Source
This commit is contained in:
noah 2021-06-08 20:09:13 +08:00
parent 626d9c46f2
commit d36f81468d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kae-phase2.patch
View File

@ -3756,8 +3756,8 @@ index 00000000..897e2c6b
+ } catch (ArrayIndexOutOfBoundsException | BadPaddingException e) { + } catch (ArrayIndexOutOfBoundsException | BadPaddingException e) {
+ if (e instanceof AEADBadTagException) { + if (e instanceof AEADBadTagException) {
+ throw e; // AEADBadTagException is expected for some tests + throw e; // AEADBadTagException is expected for some tests
+ } else if (e instanceof BadPaddingException || e.getMessage().contains("wrong final block length")) { + } else if (e instanceof BadPaddingException) {
+ if (padding == Padding.NOPADDING) { + if (padding == Padding.NOPADDING || e.getMessage().contains("wrong final block length")) {
+ throw new IllegalBlockSizeException("Input length not multiple of " + blockSize + " bytes"); + throw new IllegalBlockSizeException("Input length not multiple of " + blockSize + " bytes");
+ } else { + } else {
+ throw e; + throw e;

5
openjdk-1.8.0.spec
View File

@ -918,7 +918,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver} Version: %{javaver}.%{updatever}.%{buildver}
Release: 7 Release: 8
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # 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 # 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 # also included the epoch in their virtual provides. This created a
@ -2174,6 +2174,9 @@ require "copy_jdk_configs.lua"
%endif %endif
%changelog %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 * Tue Jun 8 2021 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.292-b10.7
- add improve_algorithmConstraints_checkAlgorithm_performance.patch - add improve_algorithmConstraints_checkAlgorithm_performance.patch