/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Oct 23 22:04:13 PDT 2012
changeset 362d237b55fa in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=362d237b55fa
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 24 04:08:07 2012 +0100
Apply 2012/10/16 security patches.
2012-10-11 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(SECURITY_PATCHES): Add new patches.
* patches/ecj/override.patch:
Add new cases in P11Key and RMIConnectionImpl
introduced by security patches.
* patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch,
* patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch:
Regenerated to still apply after security patches.
* patches/security/20121016/6631398.patch,
* patches/security/20121016/7093490.patch,
* patches/security/20121016/7143535.patch,
* patches/security/20121016/7158800.patch,
* patches/security/20121016/7158801.patch,
* patches/security/20121016/7158804.patch,
* patches/security/20121016/7167656.patch,
* patches/security/20121016/7169884.patch,
* patches/security/20121016/7169888.patch,
* patches/security/20121016/7172522.patch,
* patches/security/20121016/7176337.patch,
* patches/security/20121016/7186286.patch,
* patches/security/20121016/7189103.patch,
* patches/security/20121016/7189490.patch,
* patches/security/20121016/7189567.patch,
* patches/security/20121016/7192975.patch,
* patches/security/20121016/7195194.patch,
* patches/security/20121016/7195917.patch,
* patches/security/20121016/7195919.patch,
* patches/security/20121016/7198296.patch,
* patches/security/20121016/7198606.patch:
New patches.
changeset 7b0d155c59eb in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7b0d155c59eb
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 24 06:03:58 2012 +0100
Add latest releases to NEWS.
2012-10-24 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add 1.10.10 & 1.11.5 releases.
diffstat:
ChangeLog | 37 +
Makefile.am | 23 +-
NEWS | 63 +
patches/ecj/override.patch | 22 +
patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch | 42 +-
patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch | 51 +-
patches/security/20121016/6631398.patch | 20 +
patches/security/20121016/7093490.patch | 28 +
patches/security/20121016/7143535.patch | 31 +
patches/security/20121016/7158800.patch | 1413 +++++++++++
patches/security/20121016/7158801.patch | 30 +
patches/security/20121016/7158804.patch | 28 +
patches/security/20121016/7167656.patch | 75 +
patches/security/20121016/7169884.patch | 349 ++
patches/security/20121016/7169888.patch | 125 +
patches/security/20121016/7172522.patch | 36 +
patches/security/20121016/7176337.patch | 29 +
patches/security/20121016/7186286.patch | 552 ++++
patches/security/20121016/7189103.patch | 39 +
patches/security/20121016/7189490.patch | 55 +
patches/security/20121016/7189567.patch | 95 +
patches/security/20121016/7192975.patch | 35 +
patches/security/20121016/7195194.patch | 29 +
patches/security/20121016/7195917.patch | 88 +
patches/security/20121016/7195919.patch | 63 +
patches/security/20121016/7198296.patch | 114 +
patches/security/20121016/7198606.patch | 28 +
27 files changed, 3449 insertions(+), 51 deletions(-)
diffs (truncated from 3853 to 500 lines):
diff -r b2594f302584 -r 7b0d155c59eb ChangeLog
--- a/ChangeLog Tue Sep 25 19:08:50 2012 +0100
+++ b/ChangeLog Wed Oct 24 06:03:58 2012 +0100
@@ -1,3 +1,40 @@
+2012-10-24 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Add 1.10.10 & 1.11.5 releases.
+
+2012-10-23 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (SECURITY_PATCHES): Add new patches.
+ * patches/ecj/override.patch:
+ Add new cases in P11Key and RMIConnectionImpl
+ introduced by security patches.
+ * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch,
+ * patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch:
+ Regenerated to still apply after security patches.
+ * patches/security/20121016/6631398.patch,
+ * patches/security/20121016/7093490.patch,
+ * patches/security/20121016/7143535.patch,
+ * patches/security/20121016/7158800.patch,
+ * patches/security/20121016/7158801.patch,
+ * patches/security/20121016/7158804.patch,
+ * patches/security/20121016/7167656.patch,
+ * patches/security/20121016/7169884.patch,
+ * patches/security/20121016/7169888.patch,
+ * patches/security/20121016/7172522.patch,
+ * patches/security/20121016/7176337.patch,
+ * patches/security/20121016/7186286.patch,
+ * patches/security/20121016/7189103.patch,
+ * patches/security/20121016/7189490.patch,
+ * patches/security/20121016/7189567.patch,
+ * patches/security/20121016/7192975.patch,
+ * patches/security/20121016/7195194.patch,
+ * patches/security/20121016/7195917.patch,
+ * patches/security/20121016/7195919.patch,
+ * patches/security/20121016/7198296.patch,
+ * patches/security/20121016/7198606.patch:
+ New patches.
+
2012-09-25 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: List PR1176.
diff -r b2594f302584 -r 7b0d155c59eb Makefile.am
--- a/Makefile.am Tue Sep 25 19:08:50 2012 +0100
+++ b/Makefile.am Wed Oct 24 06:03:58 2012 +0100
@@ -198,7 +198,28 @@
ICEDTEA_FSG_PATCHES =
SECURITY_PATCHES = \
- patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch
+ patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \
+ patches/security/20121016/6631398.patch \
+ patches/security/20121016/7093490.patch \
+ patches/security/20121016/7143535.patch \
+ patches/security/20121016/7158800.patch \
+ patches/security/20121016/7158801.patch \
+ patches/security/20121016/7158804.patch \
+ patches/security/20121016/7167656.patch \
+ patches/security/20121016/7169884.patch \
+ patches/security/20121016/7169888.patch \
+ patches/security/20121016/7172522.patch \
+ patches/security/20121016/7176337.patch \
+ patches/security/20121016/7186286.patch \
+ patches/security/20121016/7189103.patch \
+ patches/security/20121016/7189490.patch \
+ patches/security/20121016/7189567.patch \
+ patches/security/20121016/7192975.patch \
+ patches/security/20121016/7195194.patch \
+ patches/security/20121016/7195917.patch \
+ patches/security/20121016/7195919.patch \
+ patches/security/20121016/7198296.patch \
+ patches/security/20121016/7198606.patch
SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
diff -r b2594f302584 -r 7b0d155c59eb NEWS
--- a/NEWS Tue Sep 25 19:08:50 2012 +0100
+++ b/NEWS Wed Oct 24 06:03:58 2012 +0100
@@ -63,6 +63,69 @@
- Add missing REF_TO_OBJs for references passed from JNI, this enable JamVM
to run Qt-Jambi
+New in release 1.11.5 (2012-10-16):
+
+* Security fixes
+ - S6631398, CVE-2012-3216: FilePermission improved path checking
+ - S7093490: adjust package access in rmiregistry
+ - S7143535, CVE-2012-5068: ScriptEngine corrected permissions
+ - S7167656, CVE-2012-5077: Multiple Seeders are being created
+ - S7169884, CVE-2012-5073: LogManager checks do not work correctly for sub-types
+ - S7169888, CVE-2012-5075: Narrowing resource definitions in JMX RMI connector
+ - S7172522, CVE-2012-5072: Improve DomainCombiner checking
+ - S7186286, CVE-2012-5081: TLS implementation to better adhere to RFC
+ - S7189103, CVE-2012-5069: Executors needs to maintain state
+ - S7189490: More improvements to DomainCombiner checking
+ - S7189567, CVE-2012-5085: java net obselete protocol
+ - S7192975, CVE-2012-5071: Conditional usage check is wrong
+ - S7195194, CVE-2012-5084: Better data validation for Swing
+ - S7195917, CVE-2012-5086: XMLDecoder parsing at close-time should be improved
+ - S7195919, CVE-2012-5979: (sl) ServiceLoader can throw CCE without needing to create instance
+ - S7198296, CVE-2012-5089: Refactor classloader usage
+ - S7158800: Improve storage of symbol tables
+ - S7158801: Improve VM CompileOnly option
+ - S7158804: Improve config file parsing
+ - S7176337: Additional changes needed for 7158801 fix
+ - S7198606, CVE-2012-4416: Improve VM optimization
+* Backports
+ - S7175845: "jar uf" changes file permissions unexpectedly
+ - S7177216: native2ascii changes file permissions of input file
+ - S7199153: TEST_BUG: try-with-resources syntax pushed to 6-open repo
+* Bug fixes
+ - PR1194: IcedTea tries to build with /usr/lib/jvm/java-openjdk (now a 1.7 VM) by default
+
+New in release 1.10.10 (2012-10-16):
+
+* Security fixes
+ - S6631398, CVE-2012-3216: FilePermission improved path checking
+ - S7093490: adjust package access in rmiregistry
+ - S7143535, CVE-2012-5068: ScriptEngine corrected permissions
+ - S7167656, CVE-2012-5077: Multiple Seeders are being created
+ - S7169884, CVE-2012-5073: LogManager checks do not work correctly for sub-types
+ - S7169888, CVE-2012-5075: Narrowing resource definitions in JMX RMI connector
+ - S7172522, CVE-2012-5072: Improve DomainCombiner checking
+ - S7186286, CVE-2012-5081: TLS implementation to better adhere to RFC
+ - S7189103, CVE-2012-5069: Executors needs to maintain state
+ - S7189490: More improvements to DomainCombiner checking
+ - S7189567, CVE-2012-5085: java net obselete protocol
+ - S7192975, CVE-2012-5071: Conditional usage check is wrong
+ - S7195194, CVE-2012-5084: Better data validation for Swing
+ - S7195917, CVE-2012-5086: XMLDecoder parsing at close-time should be improved
+ - S7195919, CVE-2012-5979: (sl) ServiceLoader can throw CCE without needing to create instance
+ - S7198296, CVE-2012-5089: Refactor classloader usage
+ - S7158800: Improve storage of symbol tables
+ - S7158801: Improve VM CompileOnly option
+ - S7158804: Improve config file parsing
+ - S7176337: Additional changes needed for 7158801 fix
+ - S7198606, CVE-2012-4416: Improve VM optimization
+* Backports
+ - S7092186: adjust package access in rmiregistry
+* Bug fixes
+ - PR1194: IcedTea tries to build with /usr/lib/jvm/java-openjdk (now a 1.7 VM) by default
+ - S7175845: "jar uf" changes file permissions unexpectedly
+ - S7177216: native2ascii changes file permissions of input file
+ - S7199153: TEST_BUG: try-with-resources syntax pushed to 6-open repo
+
New in release 1.11.4 (2012-08-31):
* Security fixes
diff -r b2594f302584 -r 7b0d155c59eb patches/ecj/override.patch
--- a/patches/ecj/override.patch Tue Sep 25 19:08:50 2012 +0100
+++ b/patches/ecj/override.patch Wed Oct 24 06:03:58 2012 +0100
@@ -219,6 +219,28 @@
public int compareTo(X509IssuerSerial another) {
int cissuer = issuer.toString()
.compareTo(another.issuer.toString());
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java
+--- openjdk-ecj.orig/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java 2012-10-11 19:58:37.130814619 +0100
++++ openjdk-ecj/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java 2012-10-11 19:59:39.699829277 +0100
+@@ -168,7 +168,6 @@
+ this.defaultContextClassLoader =
+ AccessController.doPrivileged(
+ new PrivilegedAction<ClassLoader>() {
+- @Override
+ public ClassLoader run() {
+ return new CombinedClassLoader(Thread.currentThread().getContextClassLoader(),
+ dcl);
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/sun/security/pkcs11/P11Key.java openjdk-ecj/jdk/src/share/classes/sun/security/pkcs11/P11Key.java
+--- openjdk-ecj.orig/jdk/src/share/classes/sun/security/pkcs11/P11Key.java 2012-10-11 20:18:07.340676704 +0100
++++ openjdk-ecj/jdk/src/share/classes/sun/security/pkcs11/P11Key.java 2012-10-11 20:17:40.092039288 +0100
+@@ -216,7 +216,6 @@
+ /**
+ * Return bit length of the key.
+ */
+- @Override
+ public int length() {
+ return keyLength;
+ }
diff -Nru openjdk-ecj.orig/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java openjdk-ecj/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
--- openjdk-ecj.orig/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java 2011-01-07 21:33:03.000000000 +0000
+++ openjdk-ecj/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java 2012-06-13 17:39:06.625931390 +0100
diff -r b2594f302584 -r 7b0d155c59eb patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch
--- a/patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch Tue Sep 25 19:08:50 2012 +0100
+++ b/patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch Wed Oct 24 06:03:58 2012 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java
---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2011-11-14 22:12:05.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-05-09 23:50:29.255993679 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-10-23 18:00:58.332289584 +0100
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-10-23 18:10:13.013034333 +0100
@@ -22,10 +22,10 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
@@ -206,7 +206,7 @@
} else {
throw new NoSuchPaddingException("Unsupported padding " + padding);
}
-@@ -174,7 +246,7 @@
+@@ -174,7 +247,7 @@
// see JCE spec
protected byte[] engineGetIV() {
@@ -215,7 +215,7 @@
}
// see JCE spec
-@@ -184,8 +256,9 @@
+@@ -184,8 +257,9 @@
}
IvParameterSpec ivSpec = new IvParameterSpec(iv);
try {
@@ -227,7 +227,7 @@
params.init(ivSpec);
return params;
} catch (GeneralSecurityException e) {
-@@ -209,38 +282,38 @@
+@@ -209,38 +283,38 @@
protected void engineInit(int opmode, Key key,
AlgorithmParameterSpec params, SecureRandom random)
throws InvalidKeyException, InvalidAlgorithmParameterException {
@@ -275,7 +275,7 @@
}
// actual init() implementation
-@@ -249,31 +322,31 @@
+@@ -249,31 +323,31 @@
throws InvalidKeyException, InvalidAlgorithmParameterException {
cancelOperation();
switch (opmode) {
@@ -319,7 +319,7 @@
}
// generate random IV
if (random == null) {
-@@ -284,7 +357,7 @@
+@@ -284,7 +358,7 @@
} else {
if (iv.length != blockSize) {
throw new InvalidAlgorithmParameterException
@@ -328,7 +328,7 @@
}
}
}
-@@ -330,63 +403,43 @@
+@@ -330,63 +404,43 @@
session = token.getOpSession();
}
if (encrypt) {
@@ -411,7 +411,7 @@
}
// see JCE spec
-@@ -396,6 +449,7 @@
+@@ -396,6 +450,7 @@
int n = engineUpdate(in, inOfs, inLen, out, 0);
return P11Util.convert(out, 0, n);
} catch (ShortBufferException e) {
@@ -419,7 +419,7 @@
throw new ProviderException(e);
}
}
-@@ -408,6 +462,7 @@
+@@ -408,6 +463,7 @@
}
// see JCE spec
@@ -427,7 +427,7 @@
protected int engineUpdate(ByteBuffer inBuffer, ByteBuffer outBuffer)
throws ShortBufferException {
return implUpdate(inBuffer, outBuffer);
-@@ -421,14 +476,15 @@
+@@ -421,14 +477,15 @@
int n = engineDoFinal(in, inOfs, inLen, out, 0);
return P11Util.convert(out, 0, n);
} catch (ShortBufferException e) {
@@ -445,7 +445,7 @@
int n = 0;
if ((inLen != 0) && (in != null)) {
n = engineUpdate(in, inOfs, inLen, out, outOfs);
-@@ -439,8 +495,10 @@
+@@ -439,8 +496,10 @@
}
// see JCE spec
@@ -457,7 +457,7 @@
int n = engineUpdate(inBuffer, outBuffer);
n += implDoFinal(outBuffer);
return n;
-@@ -453,18 +511,55 @@
+@@ -453,18 +512,55 @@
}
try {
ensureInitialized();
@@ -520,7 +520,7 @@
throw new ProviderException("update() failed", e);
}
}
-@@ -480,101 +575,167 @@
+@@ -480,101 +576,167 @@
if (outLen < updateLength(inLen)) {
throw new ShortBufferException();
}
@@ -731,7 +731,7 @@
throw new ShortBufferException();
}
-@@ -582,30 +743,54 @@
+@@ -582,30 +744,54 @@
ensureInitialized();
long outAddr = 0;
@@ -797,7 +797,7 @@
outBuffer.put(outArray, outOfs, k);
} else {
outBuffer.position(outBuffer.position() + k);
-@@ -616,20 +801,21 @@
+@@ -616,20 +802,21 @@
throw new ProviderException("doFinal() failed", e);
} finally {
initialized = false;
@@ -826,14 +826,14 @@
}
// see JCE spec
-@@ -648,9 +834,22 @@
+@@ -648,9 +835,22 @@
}
// see JCE spec
+ @Override
protected int engineGetKeySize(Key key) throws InvalidKeyException {
int n = P11SecretKeyFactory.convertKey
- (token, key, keyAlgorithm).keyLength();
+ (token, key, keyAlgorithm).length();
return n;
}
+
@@ -850,8 +850,8 @@
+ }
}
diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java openjdk/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java 2011-11-14 22:12:06.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java 2012-05-09 23:50:46.680268637 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java 2012-09-21 20:03:48.000000000 +0100
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java 2012-10-23 18:09:25.964291180 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
@@ -890,7 +890,7 @@
// XXX RSA_X_509, RSA_OAEP not yet supported
diff -Nru openjdk.orig/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java openjdk/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java
--- openjdk.orig/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java 2012-05-09 23:44:55.766718025 +0100
++++ openjdk/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java 2012-10-23 18:09:25.976291370 +0100
@@ -0,0 +1,282 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
diff -r b2594f302584 -r 7b0d155c59eb patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch
--- a/patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch Tue Sep 25 19:08:50 2012 +0100
+++ b/patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch Wed Oct 24 06:03:58 2012 +0100
@@ -1,13 +1,6 @@
diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java
---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-05-10 00:54:52.640846834 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-05-10 01:39:21.084801155 +0100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. 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
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-10-23 18:11:19.306081852 +0100
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-10-24 03:20:31.807709327 +0100
@@ -42,14 +42,12 @@
* Cipher implementation class. This class currently supports
* DES, DESede, AES, ARCFOUR, and Blowfish.
@@ -46,7 +39,7 @@
private byte[] iv;
// number of bytes buffered internally by the native mechanism and padBuffer
-@@ -212,6 +212,8 @@
+@@ -213,6 +213,8 @@
("CBC mode not supported with stream ciphers");
}
result = MODE_CBC;
@@ -55,7 +48,7 @@
} else {
throw new NoSuchAlgorithmException("Unsupported mode " + mode);
}
-@@ -227,6 +229,10 @@
+@@ -228,6 +230,10 @@
if (padding.equals("NOPADDING")) {
paddingType = PAD_NONE;
} else if (padding.equals("PKCS5PADDING")) {
@@ -66,7 +59,7 @@
paddingType = PAD_PKCS5;
if (mechanism != CKM_DES_CBC_PAD && mechanism != CKM_DES3_CBC_PAD &&
mechanism != CKM_AES_CBC_PAD) {
-@@ -347,11 +353,14 @@
+@@ -348,11 +354,14 @@
("IV not used in ECB mode");
}
}
@@ -84,7 +77,7 @@
}
// generate random IV
if (random == null) {
-@@ -409,13 +418,15 @@
+@@ -410,13 +419,15 @@
if (session == null) {
session = token.getOpSession();
}
@@ -105,8 +98,8 @@
} catch (PKCS11Exception ex) {
// release session when initialization failed
diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java openjdk/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java 2012-05-10 00:54:52.528845045 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java 2012-05-10 01:40:21.933694906 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java 2012-10-23 18:11:19.250080966 +0100
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java 2012-10-24 03:20:31.807709327 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -125,7 +118,7 @@
diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java
--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java 2012-05-10 01:39:21.084801155 +0100
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_AES_CTR_PARAMS.java 2012-10-24 03:20:31.823709582 +0100
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
@@ -194,8 +187,8 @@
+ }
+}
diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java
---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java 2011-11-14 22:12:06.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java 2012-05-10 01:39:21.084801155 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java 2012-09-21 20:03:48.000000000 +0100
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java 2012-10-24 03:20:31.823709582 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
@@ -223,8 +216,8 @@
this.mechanism = mechanism;
this.pParameter = pParameter;
diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java
---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java 2011-11-14 22:12:06.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java 2012-05-10 01:39:21.092801272 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java 2012-09-21 20:03:48.000000000 +0100
++++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java 2012-10-24 03:20:31.823709582 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
@@ -298,8 +291,8 @@
/* The following encoding parameter sources are defined */
public static final long CKZ_DATA_SPECIFIED = 0x00000001L;
diff -Nru openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
---- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c 2012-05-10 00:54:52.584845940 +0100
-+++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c 2012-05-10 01:40:10.989534096 +0100
+--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c 2012-10-23 18:11:19.274081347 +0100
++++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c 2012-10-24 03:20:31.823709582 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
@@ -405,7 +398,7 @@
if (jRsaPkcsOaepParamsClass == NULL) { return; }
diff -Nru openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h
--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h 2012-05-10 01:39:21.096801331 +0100
++++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h 2012-10-24 03:20:31.823709582 +0100
@@ -0,0 +1,124 @@
+/* pkcs-11v2-20a3.h include file for the PKCS #11 Version 2.20 Amendment 3
+ document. */
@@ -532,8 +525,8 @@
+
+#endif
diff -Nru openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
---- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h 2012-05-10 00:54:52.592846067 +0100
-+++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h 2012-05-10 01:40:01.709397757 +0100
+--- openjdk.orig/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h 2012-10-23 18:11:19.282081473 +0100
++++ openjdk/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h 2012-10-24 03:20:31.823709582 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
@@ -558,8 +551,8 @@
/* function to convert a PKCS#11 return value other than CK_OK into a Java Exception
* or to throw a PKCS11RuntimeException
diff -Nru openjdk.orig/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java openjdk/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java
---- openjdk.orig/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java 2012-05-10 00:54:52.532845109 +0100
-+++ openjdk/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java 2012-05-10 01:39:21.096801331 +0100
+--- openjdk.orig/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java 2012-10-23 18:11:19.250080966 +0100
++++ openjdk/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java 2012-10-24 03:20:31.823709582 +0100
@@ -33,7 +33,7 @@
/**
@@ -585,8 +578,8 @@
private static StringBuffer debugBuf = new StringBuffer();
diff -Nru openjdk.orig/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java openjdk/jdk/test/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java
More information about the distro-pkg-dev
mailing list