From d8b583ed71fb866601f16ef9b6b2a769fed1c2a7 Mon Sep 17 00:00:00 2001 From: kuenking111 Date: Fri, 21 May 2021 17:26:06 +0800 Subject: [PATCH] I3SDMD: Delay initializtion of AID cache table until after jar verification --- ...wei_add_oid_mapping_common_sig_types.patch | 29 +++++++++++++++++++ java-1.8.0-openjdk.spec | 7 ++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100755 8266929_huawei_add_oid_mapping_common_sig_types.patch diff --git a/8266929_huawei_add_oid_mapping_common_sig_types.patch b/8266929_huawei_add_oid_mapping_common_sig_types.patch new file mode 100755 index 0000000..19a2147 --- /dev/null +++ b/8266929_huawei_add_oid_mapping_common_sig_types.patch @@ -0,0 +1,29 @@ +diff --git a/jdk/src/share/classes/sun/security/x509/AlgorithmId.java b/jdk/src/share/classes/sun/security/x509/AlgorithmId.java +index 502c52f30..41df5d290 100644 +--- a/jdk/src/share/classes/sun/security/x509/AlgorithmId.java ++++ b/jdk/src/share/classes/sun/security/x509/AlgorithmId.java +@@ -589,6 +589,24 @@ public class AlgorithmId implements Serializable, DerEncoder { + || name.equalsIgnoreCase("SHA1/RSA")) { + return AlgorithmId.sha1WithRSAEncryption_oid; + } ++ if (name.equalsIgnoreCase("SHA224withRSA")) { ++ return AlgorithmId.sha224WithRSAEncryption_oid; ++ } ++ if (name.equalsIgnoreCase("SHA256withRSA")) { ++ return AlgorithmId.sha256WithRSAEncryption_oid; ++ } ++ if (name.equalsIgnoreCase("SHA384withRSA")) { ++ return AlgorithmId.sha384WithRSAEncryption_oid; ++ } ++ if (name.equalsIgnoreCase("SHA512withRSA")) { ++ return AlgorithmId.sha512WithRSAEncryption_oid; ++ } ++ if (name.equalsIgnoreCase("SHA512/224withRSA")) { ++ return AlgorithmId.sha512_224WithRSAEncryption_oid; ++ } ++ if (name.equalsIgnoreCase("SHA512/256withRSA")) { ++ return AlgorithmId.sha512_256WithRSAEncryption_oid; ++ } + if (name.equalsIgnoreCase("SHA1withECDSA") + || name.equalsIgnoreCase("ECDSA")) { + return AlgorithmId.sha1WithECDSA_oid; diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index e493a00..6800c7f 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -921,7 +921,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 3 +Release: 4 # 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 @@ -1103,6 +1103,7 @@ Patch186: update-to-keep-same-with-master.patch Patch187: 8182036.patch Patch188: 8247691_incorrect_handling_of_VM_exceptions_in_C1_deopt_stub.patch Patch189: 8266187_Memory_leak_in_appendBootClassPath.patch +Patch190: 8266929_huawei_add_oid_mapping_common_sig_types.patch ############################################# # @@ -1552,6 +1553,7 @@ pushd %{top_level_dir_name} %patch187 -p1 %patch188 -p1 %patch189 -p1 +%patch190 -p1 popd @@ -2169,6 +2171,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Fri May 20 2021 kuenking111 - 1:1.8.0.292-b10.3 +- add 8266929_huawei_add_oid_mapping_common_sig_types.patch + * Fri May 20 2021 kuenking111 - 1:1.8.0.292-b10.2 - add 8266187_Memory_leak_in_appendBootClassPath.patch -- Gitee