[java-1.7.0-openjdk/f19] added java-1.7.0-openjdk-doNotUseDisabledEcc.patch

jiri vanek jvanek at fedoraproject.org
Mon Sep 2 13:11:16 UTC 2013


commit 3bbca8ea2e80da6e44cd547d84609632ac9e65eb
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Mon Sep 2 15:10:55 2013 +0200

    added java-1.7.0-openjdk-doNotUseDisabledEcc.patch

 java-1.7.0-openjdk-doNotUseDisabledEcc.patch |   26 ++++++++++++++++++++++++++
 java-1.7.0-openjdk.spec                      |    1 +
 2 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/java-1.7.0-openjdk-doNotUseDisabledEcc.patch b/java-1.7.0-openjdk-doNotUseDisabledEcc.patch
new file mode 100644
index 0000000..54d374d
--- /dev/null
+++ b/java-1.7.0-openjdk-doNotUseDisabledEcc.patch
@@ -0,0 +1,26 @@
+diff -up openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java.sav openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java
+--- openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java.sav	2013-01-14 12:04:57.096097896 -0500
++++ openjdk/jdk/src/share/classes/sun/security/x509/AlgorithmId.java	2013-01-14 12:05:14.956835554 -0500
+@@ -120,20 +120,8 @@ public class AlgorithmId implements Seri
+         try {
+             algParams = AlgorithmParameters.getInstance(algidString);
+         } catch (NoSuchAlgorithmException e) {
+-            try {
+-                // Try the internal EC code so that we can fully parse EC
+-                // keys even if the provider is not registered.
+-                // This code can go away once we have EC in the SUN provider.
+-                algParams = AlgorithmParameters.getInstance(algidString,
+-                                sun.security.ec.ECKeyFactory.ecInternalProvider);
+-            } catch (NoSuchAlgorithmException ee) {
+-                /*
+-                 * This algorithm parameter type is not supported, so we cannot
+-                 * parse the parameters.
+-                 */
+-                algParams = null;
+-                return;
+-            }
++            algParams = null;
++            return;
+         }
+         // Decode (parse) the parameters
+         algParams.init(params.toByteArray());
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 09d6a4c..5c34995 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -1294,6 +1294,7 @@ exit 0
 %changelog
 * Mon Sep 02 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.4.1.1.f19
 - updated to icedtea 2.4
+ - added java-1.7.0-openjdk-doNotUseDisabledEcc.patch
  - deleted usptreamed 657854-openjdk7.patch
  - deleted usptreamed callerclass-01.patch
  - deleted usptreamed callerclass-02.patch


More information about the scm-commits mailing list