/hg/icedtea: Remove unused patches.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Dec 10 05:43:08 PST 2010
changeset 93ac4fddecf3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=93ac4fddecf3
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Dec 10 13:43:00 2010 +0000
Remove unused patches.
2010-12-09 Andrew John Hughes <ahughes at redhat.com>
* patches/hotspot/default/icedtea-gcc-4.3.patch,
* patches/hotspot/default/icedtea-sparc-buildfixes.patch,
* patches/icedtea-6484091.patch,
* patches/icedtea-6497740.patch,
* patches/icedtea-6588160.patch,
* patches/icedtea-6700047-loopopts.patch,
* patches/icedtea-6712835-ifnode.patch,
* patches/icedtea-6721753.patch,
* patches/icedtea-6726779.patch,
* patches/icedtea-6734167.patch,
* patches/icedtea-6766136.patch,
* patches/icedtea-LCMS-setTagData.patch,
* patches/icedtea-color-createcontext.patch,
* patches/icedtea-hotspot-params-cast-size_t.patch,
* patches/icedtea-hotspot-use-idx_t.patch,
* patches/icedtea-hotspot7-build-fixes.patch,
* patches/icedtea-lcms-leak.patch,
* patches/icedtea-lucene-crash.patch,
* patches/icedtea-signed-types-hot6.patch,
* patches/icedtea-static-libstdc++.patch: Remove unused
patches.
diffstat:
22 files changed, 26 insertions(+), 3026 deletions(-)
ChangeLog | 24
NEWS | 2
patches/hotspot/default/icedtea-gcc-4.3.patch | 54
patches/hotspot/default/icedtea-sparc-buildfixes.patch | 35
patches/icedtea-6484091.patch | 119 -
patches/icedtea-6497740.patch | 1557 ----------------
patches/icedtea-6588160.patch | 42
patches/icedtea-6700047-loopopts.patch | 34
patches/icedtea-6712835-ifnode.patch | 25
patches/icedtea-6721753.patch | 117 -
patches/icedtea-6726779.patch | 142 -
patches/icedtea-6734167.patch | 89
patches/icedtea-6766136.patch | 189 -
patches/icedtea-LCMS-setTagData.patch | 296 ---
patches/icedtea-color-createcontext.patch | 36
patches/icedtea-hotspot-params-cast-size_t.patch | 121 -
patches/icedtea-hotspot-use-idx_t.patch | 45
patches/icedtea-hotspot7-build-fixes.patch | 32
patches/icedtea-lcms-leak.patch | 11
patches/icedtea-lucene-crash.patch | 44
patches/icedtea-signed-types-hot6.patch | 22
patches/icedtea-static-libstdc++.patch | 16
diffs (truncated from 3148 to 500 lines):
diff -r 464f7b987fb6 -r 93ac4fddecf3 ChangeLog
--- a/ChangeLog Thu Dec 09 17:41:47 2010 +0000
+++ b/ChangeLog Fri Dec 10 13:43:00 2010 +0000
@@ -1,3 +1,27 @@ 2010-12-09 Andrew John Hughes <ahughes
+2010-12-09 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/hotspot/default/icedtea-gcc-4.3.patch,
+ * patches/hotspot/default/icedtea-sparc-buildfixes.patch,
+ * patches/icedtea-6484091.patch,
+ * patches/icedtea-6497740.patch,
+ * patches/icedtea-6588160.patch,
+ * patches/icedtea-6700047-loopopts.patch,
+ * patches/icedtea-6712835-ifnode.patch,
+ * patches/icedtea-6721753.patch,
+ * patches/icedtea-6726779.patch,
+ * patches/icedtea-6734167.patch,
+ * patches/icedtea-6766136.patch,
+ * patches/icedtea-LCMS-setTagData.patch,
+ * patches/icedtea-color-createcontext.patch,
+ * patches/icedtea-hotspot-params-cast-size_t.patch,
+ * patches/icedtea-hotspot-use-idx_t.patch,
+ * patches/icedtea-hotspot7-build-fixes.patch,
+ * patches/icedtea-lcms-leak.patch,
+ * patches/icedtea-lucene-crash.patch,
+ * patches/icedtea-signed-types-hot6.patch,
+ * patches/icedtea-static-libstdc++.patch:
+ Remove unused patches.
+
2010-12-09 Andrew John Hughes <ahughes at redhat.com>
Remove NetX and the IcedTea plugin; now developed
diff -r 464f7b987fb6 -r 93ac4fddecf3 NEWS
--- a/NEWS Thu Dec 09 17:41:47 2010 +0000
+++ b/NEWS Fri Dec 10 13:43:00 2010 +0000
@@ -1,5 +1,7 @@ New in release 1.14 (XXXX-XX-XX)
New in release 1.14 (XXXX-XX-XX)
+* NetX and the plugin moved to the IcedTea-Web project with a separate
+ release cycle.
* Zero/Shark
- Match Shark in icedtea6, makes OSR work by removing vestigal check.
- LLVM 2.7 non-product fixes.
diff -r 464f7b987fb6 -r 93ac4fddecf3 patches/hotspot/default/icedtea-gcc-4.3.patch
--- a/patches/hotspot/default/icedtea-gcc-4.3.patch Thu Dec 09 17:41:47 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2008-12-01 12:06:51.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2008-12-01 12:27:08.000000000 +0000
-@@ -98,7 +98,7 @@
- endif
-
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+# WARNINGS_ARE_ERRORS = -Werror
-
- # Except for a few acceptable ones
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
-diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/gcc.make openjdk/hotspot/make/solaris/makefiles/gcc.make
---- openjdk.orig/hotspot/make/solaris/makefiles/gcc.make 2008-11-22 00:11:18.000000000 +0000
-+++ openjdk/hotspot/make/solaris/makefiles/gcc.make 2008-12-01 12:25:10.000000000 +0000
-@@ -109,7 +109,8 @@
-
-
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+# Commented out for now because of gcc 4.3 warnings OpenJDK isn't ready for
-+# WARNINGS_ARE_ERRORS = -Werror
- # Enable these warnings. See 'info gcc' about details on these options
- ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
- CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS)
-diff -Nru openjdk.orig/hotspot/src/share/vm/adlc/filebuff.cpp openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
---- openjdk.orig/hotspot/src/share/vm/adlc/filebuff.cpp 2008-11-22 00:11:18.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/adlc/filebuff.cpp 2008-12-01 12:25:10.000000000 +0000
-@@ -25,6 +25,8 @@
- // FILEBUFF.CPP - Routines for handling a parser file buffer
- #include "adlc.hpp"
-
-+using namespace std;
-+
- //------------------------------FileBuff---------------------------------------
- // Create a new parsing buffer
- FileBuff::FileBuff( BufferedFile *fptr, ArchDesc& archDesc) : _fp(fptr), _AD(archDesc) {
-diff -Nru openjdk.orig/hotspot/src/share/vm/adlc/filebuff.hpp openjdk/hotspot/src/share/vm/adlc/filebuff.hpp
---- openjdk.orig/hotspot/src/share/vm/adlc/filebuff.hpp 2008-11-22 00:11:18.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/adlc/filebuff.hpp 2008-12-01 12:25:10.000000000 +0000
-@@ -94,8 +94,11 @@
- FileBuffRegion *copy(); // Deep copy
- FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input
-
--// void print(std::ostream&);
--// friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
-+#if defined(__GNUC__) && __GNUC__ >= 3
-+ void print(std::ostream&);
-+ friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
-+#else
- void print(ostream&);
- friend ostream& operator<< (ostream&, FileBuffRegion&);
-+#endif
- };
diff -r 464f7b987fb6 -r 93ac4fddecf3 patches/hotspot/default/icedtea-sparc-buildfixes.patch
--- a/patches/hotspot/default/icedtea-sparc-buildfixes.patch Thu Dec 09 17:41:47 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
---- openjdk/hotspot/make/linux/makefiles/gcc.make.orig 2008-12-04 20:29:08.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2008-12-04 20:32:54.000000000 +0000
-@@ -52,6 +52,10 @@
- PICFLAG = -fpic
- endif
-
-+ifneq ($(filter sparc sparcv9,$(BUILDARCH)),)
-+PICFLAG = -fPIC
-+endif
-+
- VM_PICFLAG/LIBJVM = $(PICFLAG)
- VM_PICFLAG/AOUT =
- VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
---- openjdk/hotspot/make/linux/makefiles/defs.make.orig 2008-12-04 20:29:04.000000000 +0000
-+++ openjdk/hotspot/make/linux/makefiles/defs.make 2008-12-04 20:32:54.000000000 +0000
-@@ -59,7 +59,7 @@
- endif
-
- # sparc
--ifeq ($(ARCH), sparc64)
-+ifneq (,$(filter $(ARCH), sparc sparc64))
- ifeq ($(ARCH_DATA_MODEL), 64)
- ARCH_DATA_MODEL = 64
- MAKE_ARGS += LP64=1
---- openjdk/hotspot/src/cpu/sparc/vm/frame_sparc.hpp.orig 2008-12-04 20:32:19.000000000 +0000
-+++ openjdk/hotspot/src/cpu/sparc/vm/frame_sparc.hpp 2008-12-04 20:32:54.000000000 +0000
-@@ -264,7 +264,7 @@
-
- private:
-
-- constantPoolCacheOop* frame::interpreter_frame_cpoolcache_addr() const;
-+ constantPoolCacheOop* interpreter_frame_cpoolcache_addr() const;
-
- #ifndef CC_INTERP
-
diff -r 464f7b987fb6 -r 93ac4fddecf3 patches/icedtea-6484091.patch
--- a/patches/icedtea-6484091.patch Thu Dec 09 17:41:47 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
---- openjdk.orig/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java 2008-12-02 14:54:58.000000000 +0000
-+++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java 2008-12-02 15:12:35.000000000 +0000
-@@ -39,6 +39,8 @@
- import java.io.FileNotFoundException;
- import java.io.IOException;
- import java.util.*;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
-
- import sun.awt.shell.ShellFolder;
- import sun.awt.OSInfo;
-@@ -1153,7 +1155,11 @@
-
- File[] baseFolders;
- if (useShellFolder) {
-- baseFolders = (File[])ShellFolder.get("fileChooserComboBoxFolders");
-+ baseFolders = AccessController.doPrivileged(new PrivilegedAction<File[]>() {
-+ public File[] run() {
-+ return (File[]) ShellFolder.get("fileChooserComboBoxFolders");
-+ }
-+ });
- } else {
- baseFolders = fsv.getRoots();
- }
-diff -Nru openjdk.orig/jdk/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java openjdk/jdk/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
---- openjdk.orig/jdk/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java 2008-12-02 14:55:11.000000000 +0000
-+++ openjdk/jdk/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java 2008-12-02 15:12:35.000000000 +0000
-@@ -38,6 +38,8 @@
- import java.io.FileNotFoundException;
- import java.io.IOException;
- import java.util.*;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
- import javax.accessibility.*;
-
- import sun.awt.shell.ShellFolder;
-@@ -957,7 +959,11 @@
-
- File[] baseFolders;
- if (useShellFolder) {
-- baseFolders = (File[])ShellFolder.get("fileChooserComboBoxFolders");
-+ baseFolders = AccessController.doPrivileged(new PrivilegedAction<File[]>() {
-+ public File[] run() {
-+ return (File[]) ShellFolder.get("fileChooserComboBoxFolders");
-+ }
-+ });
- } else {
- baseFolders = fsv.getRoots();
- }
-diff -Nru openjdk.orig/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java openjdk/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
---- openjdk.orig/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java 2008-12-02 14:55:05.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java 2008-12-02 15:12:35.000000000 +0000
-@@ -29,6 +29,8 @@
- import java.beans.*;
- import java.io.*;
- import java.util.*;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
-
- import javax.swing.*;
- import javax.swing.event.*;
-@@ -769,7 +771,11 @@
-
- File[] baseFolders;
- if (useShellFolder) {
-- baseFolders = (File[])ShellFolder.get("fileChooserComboBoxFolders");
-+ baseFolders = AccessController.doPrivileged(new PrivilegedAction<File[]>() {
-+ public File[] run() {
-+ return (File[]) ShellFolder.get("fileChooserComboBoxFolders");
-+ }
-+ });
- } else {
- baseFolders = fsv.getRoots();
- }
-diff -Nru openjdk.orig/jdk/test/javax/swing/JFileChooser/6484091/bug6484091.java openjdk/jdk/test/javax/swing/JFileChooser/6484091/bug6484091.java
---- openjdk.orig/jdk/test/javax/swing/JFileChooser/6484091/bug6484091.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/test/javax/swing/JFileChooser/6484091/bug6484091.java 2008-12-02 15:12:35.000000000 +0000
-@@ -0,0 +1,40 @@
-+/* @test @(#)bug6484091.java 1.1 08/11/18
-+ * @bug 6484091
-+ * @summary FileSystemView leaks directory info
-+ * @author Pavel Porvatov
-+ @run main bug6484091
-+ */
-+
-+import java.io.*;
-+import java.security.AccessControlException;
-+import javax.swing.filechooser.FileSystemView;
-+import javax.swing.*;
-+
-+import sun.awt.shell.ShellFolder;
-+
-+public class bug6484091 {
-+ public static void main(String[] args) {
-+ ShellFolder dir = (ShellFolder) FileSystemView.getFileSystemView().getDefaultDirectory();
-+
-+ printDirContent(dir);
-+
-+ System.setSecurityManager(new SecurityManager());
-+
-+ // The next test cases use 'dir' obtained without SecurityManager
-+ try {
-+ printDirContent(dir);
-+
-+ throw new RuntimeException("Dir content was derived bypass SecurityManager");
-+ } catch (AccessControlException e) {
-+ // It's a successful situation
-+ }
-+ }
-+
-+ private static void printDirContent(File dir) {
-+ System.out.println("Files in " + dir.getAbsolutePath() + ":");
-+
-+ for (File file : dir.listFiles()) {
-+ System.out.println(file.getName());
-+ }
-+ }
-+}
diff -r 464f7b987fb6 -r 93ac4fddecf3 patches/icedtea-6497740.patch
--- a/patches/icedtea-6497740.patch Thu Dec 09 17:41:47 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1557 +0,0 @@
-diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java
---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java 2008-12-02 15:15:13.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java 2008-12-02 15:22:50.000000000 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
-+ * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -38,6 +38,8 @@
- import sun.security.pkcs11.wrapper.*;
- import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
-
-+import sun.security.rsa.RSAKeyFactory;
-+
- /**
- * KeyPairGenerator implementation class. This class currently supports
- * RSA, DSA, DH, and EC.
-@@ -66,7 +68,7 @@
- private AlgorithmParameterSpec params;
-
- // for RSA, selected or default value of public exponent, always valid
-- private BigInteger rsaPublicExponent;
-+ private BigInteger rsaPublicExponent = RSAKeyGenParameterSpec.F4;
-
- // SecureRandom instance, if specified in init
- private SecureRandom random;
-@@ -88,19 +90,19 @@
- public void initialize(int keySize, SecureRandom random) {
- token.ensureValid();
- try {
-- checkKeySize(keySize);
-+ checkKeySize(keySize, null);
- } catch (InvalidAlgorithmParameterException e) {
- throw new InvalidParameterException(e.getMessage());
- }
- this.keySize = keySize;
- this.params = null;
- this.random = random;
-- this.rsaPublicExponent = RSAKeyGenParameterSpec.F4;
- if (algorithm.equals("EC")) {
- params = P11ECKeyFactory.getECParameterSpec(keySize);
- if (params == null) {
-- throw new InvalidParameterException
-- ("No EC parameters available for key size " + keySize + " bits");
-+ throw new InvalidParameterException(
-+ "No EC parameters available for key size "
-+ + keySize + " bits");
- }
- }
- }
-@@ -115,8 +117,10 @@
- ("DHParameterSpec required for Diffie-Hellman");
- }
- DHParameterSpec dhParams = (DHParameterSpec)params;
-- this.keySize = dhParams.getP().bitLength();
-- this.params = params;
-+ int tmpKeySize = dhParams.getP().bitLength();
-+ checkKeySize(tmpKeySize, dhParams);
-+ this.keySize = tmpKeySize;
-+ this.params = dhParams;
- // XXX sanity check params
- } else if (algorithm.equals("RSA")) {
- if (params instanceof RSAKeyGenParameterSpec == false) {
-@@ -124,7 +128,9 @@
- ("RSAKeyGenParameterSpec required for RSA");
- }
- RSAKeyGenParameterSpec rsaParams = (RSAKeyGenParameterSpec)params;
-- this.keySize = rsaParams.getKeysize();
-+ int tmpKeySize = rsaParams.getKeysize();
-+ checkKeySize(tmpKeySize, rsaParams);
-+ this.keySize = tmpKeySize;
- this.params = null;
- this.rsaPublicExponent = rsaParams.getPublicExponent();
- // XXX sanity check params
-@@ -134,13 +140,16 @@
- ("DSAParameterSpec required for DSA");
- }
- DSAParameterSpec dsaParams = (DSAParameterSpec)params;
-- this.keySize = dsaParams.getP().bitLength();
-- this.params = params;
-+ int tmpKeySize = dsaParams.getP().bitLength();
-+ checkKeySize(tmpKeySize, dsaParams);
-+ this.keySize = tmpKeySize;
-+ this.params = dsaParams;
- // XXX sanity check params
- } else if (algorithm.equals("EC")) {
- ECParameterSpec ecParams;
- if (params instanceof ECParameterSpec) {
-- ecParams = P11ECKeyFactory.getECParameterSpec((ECParameterSpec)params);
-+ ecParams = P11ECKeyFactory.getECParameterSpec(
-+ (ECParameterSpec)params);
- if (ecParams == null) {
- throw new InvalidAlgorithmParameterException
- ("Unsupported curve: " + params);
-@@ -156,16 +165,17 @@
- throw new InvalidAlgorithmParameterException
- ("ECParameterSpec or ECGenParameterSpec required for EC");
- }
-- this.keySize = ecParams.getCurve().getField().getFieldSize();
-+ int tmpKeySize = ecParams.getCurve().getField().getFieldSize();
-+ checkKeySize(tmpKeySize, ecParams);
-+ this.keySize = tmpKeySize;
- this.params = ecParams;
- } else {
- throw new ProviderException("Unknown algorithm: " + algorithm);
- }
- this.random = random;
-- checkKeySize(keySize);
- }
-
-- private void checkKeySize(int keySize)
-+ private void checkKeySize(int keySize, AlgorithmParameterSpec params)
- throws InvalidAlgorithmParameterException {
- if (algorithm.equals("EC")) {
- if (keySize < 112) {
-@@ -178,13 +188,28 @@
- ("Key size must be at most 2048 bit");
- }
- return;
-+ } else if (algorithm.equals("RSA")) {
-+ BigInteger tmpExponent = rsaPublicExponent;
-+ if (params != null) {
-+ // Already tested for instanceof RSAKeyGenParameterSpec above
-+ tmpExponent =
-+ ((RSAKeyGenParameterSpec)params).getPublicExponent();
-+ }
-+ try {
-+ // This provider supports 64K or less.
-+ RSAKeyFactory.checkKeyLengths(keySize, tmpExponent,
-+ 512, 64 * 1024);
-+ } catch (InvalidKeyException e) {
-+ throw new InvalidAlgorithmParameterException(e.getMessage());
-+ }
-+ return;
- }
-+
- if (keySize < 512) {
- throw new InvalidAlgorithmParameterException
- ("Key size must be at least 512 bit");
- }
-- if (algorithm.equals("RSA") ||
-- (algorithm.equals("DH") && (params != null))) {
-+ if (algorithm.equals("DH") && (params != null)) {
- // sanity check, nobody really wants keys this large
- if (keySize > 64 * 1024) {
- throw new InvalidAlgorithmParameterException
-diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java
---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java 2008-12-02 15:15:13.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java 2008-12-02 15:22:50.000000000 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
-+ * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -35,6 +35,8 @@
- import sun.security.pkcs11.wrapper.*;
- import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
-
-+import sun.security.rsa.RSAKeyFactory;
-+
- /**
- * RSA KeyFactory implemenation.
- *
-@@ -131,6 +133,9 @@
- } catch (PKCS11Exception e) {
- throw new InvalidKeySpecException
- ("Could not create RSA public key", e);
-+ } catch (InvalidKeyException e) {
-+ throw new InvalidKeySpecException
-+ ("Could not create RSA public key", e);
- }
- }
-
-@@ -175,11 +180,15 @@
- } catch (PKCS11Exception e) {
- throw new InvalidKeySpecException
- ("Could not create RSA private key", e);
-+ } catch (InvalidKeyException e) {
-+ throw new InvalidKeySpecException
-+ ("Could not create RSA private key", e);
- }
- }
-
- private PublicKey generatePublic(BigInteger n, BigInteger e)
-- throws PKCS11Exception {
-+ throws PKCS11Exception, InvalidKeyException {
-+ RSAKeyFactory.checkKeyLengths(n.bitLength(), e, -1, 64 * 1024);
- CK_ATTRIBUTE[] attributes = new CK_ATTRIBUTE[] {
- new CK_ATTRIBUTE(CKA_CLASS, CKO_PUBLIC_KEY),
- new CK_ATTRIBUTE(CKA_KEY_TYPE, CKK_RSA),
-@@ -200,7 +209,8 @@
- }
-
- private PrivateKey generatePrivate(BigInteger n, BigInteger d)
-- throws PKCS11Exception {
-+ throws PKCS11Exception, InvalidKeyException {
-+ RSAKeyFactory.checkKeyLengths(n.bitLength(), null, -1, 64 * 1024);
- CK_ATTRIBUTE[] attributes = new CK_ATTRIBUTE[] {
- new CK_ATTRIBUTE(CKA_CLASS, CKO_PRIVATE_KEY),
- new CK_ATTRIBUTE(CKA_KEY_TYPE, CKK_RSA),
-@@ -222,7 +232,9 @@
-
- private PrivateKey generatePrivate(BigInteger n, BigInteger e,
- BigInteger d, BigInteger p, BigInteger q, BigInteger pe,
-- BigInteger qe, BigInteger coeff) throws PKCS11Exception {
-+ BigInteger qe, BigInteger coeff) throws PKCS11Exception,
-+ InvalidKeyException {
-+ RSAKeyFactory.checkKeyLengths(n.bitLength(), e, -1, 64 * 1024);
- CK_ATTRIBUTE[] attributes = new CK_ATTRIBUTE[] {
- new CK_ATTRIBUTE(CKA_CLASS, CKO_PRIVATE_KEY),
- new CK_ATTRIBUTE(CKA_KEY_TYPE, CKK_RSA),
-diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/rsa/RSAKeyFactory.java openjdk/jdk/src/share/classes/sun/security/rsa/RSAKeyFactory.java
---- openjdk.orig/jdk/src/share/classes/sun/security/rsa/RSAKeyFactory.java 2008-12-02 15:15:10.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/security/rsa/RSAKeyFactory.java 2008-12-02 15:22:50.000000000 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
-+ * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -31,6 +31,8 @@
- import java.security.interfaces.*;
- import java.security.spec.*;
-
-+import sun.security.action.GetPropertyAction;
-+
- /**
- * KeyFactory for RSA keys. Keys must be instances of PublicKey or PrivateKey
- * and getAlgorithm() must return "RSA". For such keys, it supports conversion
More information about the distro-pkg-dev
mailing list