/hg/release/icedtea7-forest-2.4/jdk: 8 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jun 7 11:46:18 PDT 2013
changeset fdd98e50f1df in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fdd98e50f1df
author: andrew
date: Fri May 31 23:03:47 2013 +0100
PR1435: OpenJDK 7 returns incorrect TrueType font metrics
changeset 083cb3631cb8 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=083cb3631cb8
author: andrew
date: Wed Jun 05 16:26:32 2013 +0100
PR728: GTKLookAndFeel does not honor gtk-alternative-button-order
changeset 50467fb717f8 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=50467fb717f8
author: simonis
date: Mon May 06 12:57:42 2013 -0700
7191872: Xrender: No text displayed using 64 bit JDK on solaris11-sparc
Reviewed-by: prr, ceisserer
changeset 3b009d41bc31 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3b009d41bc31
author: peytoia
date: Thu May 30 14:34:18 2013 +0900
8014469: (tz) Support tzdata2013c
8015570: Use long comparison in Rule.getRules().
Reviewed-by: okutsu
changeset 5a7678b3a250 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5a7678b3a250
author: andrew
date: Wed Jun 05 16:34:26 2013 +0100
9001039: DHKeyAgreement calculates wrong TlsPremasterSecret 1 out of 256 times
changeset 12756cb85ec1 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=12756cb85ec1
author: andrew
date: Thu Jun 06 17:58:10 2013 +0100
8014618: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
Reviewed-by: xuelei
Contributed-by: Pasi Eronen <pe at iki.fi>
changeset 3f1f89553b54 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3f1f89553b54
author: andrew
date: Thu Jun 06 18:29:16 2013 +0100
Remove changes accidentally included in jcheck removal.
changeset d1563025e086 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d1563025e086
author: andrew
date: Fri Jun 07 19:44:57 2013 +0100
Merge
diffstat:
make/java/text/base/Makefile | 1 -
make/sun/javazic/tzdata/VERSION | 2 +-
make/sun/javazic/tzdata/antarctica | 42 +-
make/sun/javazic/tzdata/asia | 62 +-
make/sun/javazic/tzdata/australasia | 23 +-
make/sun/javazic/tzdata/southamerica | 10 +-
make/sun/javazic/tzdata/zone.tab | 2 +-
make/sun/text/Makefile | 1 -
make/tools/src/build/tools/javazic/Rule.java | 2 +-
src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java | 6 +-
src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java | 3 +-
src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java | 10 +-
src/share/classes/sun/font/FileFontStrike.java | 11 +-
src/share/classes/sun/font/GlyphList.java | 12 +-
src/share/classes/sun/security/pkcs11/P11KeyAgreement.java | 4 +-
src/share/classes/sun/security/pkcs11/P11Signature.java | 7 +-
src/share/classes/sun/security/pkcs11/P11Util.java | 16 +-
src/share/classes/sun/security/util/KeyUtil.java | 21 +-
src/share/native/sun/font/freetypeScaler.c | 7 +-
src/solaris/classes/sun/font/XRGlyphCacheEntry.java | 30 +-
src/solaris/native/sun/awt/gtk2_interface.c | 10 +
src/solaris/native/sun/awt/gtk2_interface.h | 3 +-
src/solaris/native/sun/java2d/x11/XRBackendNative.c | 7 +-
test/Makefile | 6 +
test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java | 420 ++++++++++
test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java | 410 +++++++++
26 files changed, 989 insertions(+), 139 deletions(-)
diffs (truncated from 1498 to 500 lines):
diff -r 883a1fbc5c1a -r d1563025e086 make/java/text/base/Makefile
--- a/make/java/text/base/Makefile Wed May 22 16:12:05 2013 +0100
+++ b/make/java/text/base/Makefile Fri Jun 07 19:44:57 2013 +0100
@@ -81,7 +81,6 @@
$(TEXT_SOURCES)
$(MKDIR) -p $(TEXT_CLASSDIR)
$(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
- -Xbootclasspath/a:$(ABS_OUTPUTDIR)/classes \
-jar $(GENERATEBREAKITERATORDATA_JARFILE) \
-o $(TEXT_CLASSDIR) \
-spec $(UNICODEDATA)/UnicodeData.txt
diff -r 883a1fbc5c1a -r d1563025e086 make/sun/javazic/tzdata/VERSION
--- a/make/sun/javazic/tzdata/VERSION Wed May 22 16:12:05 2013 +0100
+++ b/make/sun/javazic/tzdata/VERSION Fri Jun 07 19:44:57 2013 +0100
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2013b
+tzdata2013c
diff -r 883a1fbc5c1a -r d1563025e086 make/sun/javazic/tzdata/antarctica
--- a/make/sun/javazic/tzdata/antarctica Wed May 22 16:12:05 2013 +0100
+++ b/make/sun/javazic/tzdata/antarctica Fri Jun 07 19:44:57 2013 +0100
@@ -76,34 +76,6 @@
Rule ChileAQ 2012 max - Apr Sun>=23 3:00u 0 -
Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S
-# These rules are stolen from the `australasia' file.
-Rule AusAQ 1917 only - Jan 1 0:01 1:00 -
-Rule AusAQ 1917 only - Mar 25 2:00 0 -
-Rule AusAQ 1942 only - Jan 1 2:00 1:00 -
-Rule AusAQ 1942 only - Mar 29 2:00 0 -
-Rule AusAQ 1942 only - Sep 27 2:00 1:00 -
-Rule AusAQ 1943 1944 - Mar lastSun 2:00 0 -
-Rule AusAQ 1943 only - Oct 3 2:00 1:00 -
-Rule ATAQ 1967 only - Oct Sun>=1 2:00s 1:00 -
-Rule ATAQ 1968 only - Mar lastSun 2:00s 0 -
-Rule ATAQ 1968 1985 - Oct lastSun 2:00s 1:00 -
-Rule ATAQ 1969 1971 - Mar Sun>=8 2:00s 0 -
-Rule ATAQ 1972 only - Feb lastSun 2:00s 0 -
-Rule ATAQ 1973 1981 - Mar Sun>=1 2:00s 0 -
-Rule ATAQ 1982 1983 - Mar lastSun 2:00s 0 -
-Rule ATAQ 1984 1986 - Mar Sun>=1 2:00s 0 -
-Rule ATAQ 1986 only - Oct Sun>=15 2:00s 1:00 -
-Rule ATAQ 1987 1990 - Mar Sun>=15 2:00s 0 -
-Rule ATAQ 1987 only - Oct Sun>=22 2:00s 1:00 -
-Rule ATAQ 1988 1990 - Oct lastSun 2:00s 1:00 -
-Rule ATAQ 1991 1999 - Oct Sun>=1 2:00s 1:00 -
-Rule ATAQ 1991 2005 - Mar lastSun 2:00s 0 -
-Rule ATAQ 2000 only - Aug lastSun 2:00s 1:00 -
-Rule ATAQ 2001 max - Oct Sun>=1 2:00s 1:00 -
-Rule ATAQ 2006 only - Apr Sun>=1 2:00s 0 -
-Rule ATAQ 2007 only - Mar lastSun 2:00s 0 -
-Rule ATAQ 2008 max - Apr Sun>=1 2:00s 0 -
-
# Argentina - year-round bases
# Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
# Esperanza, San Martin Land, -6323-05659, since 1952-12-17
@@ -145,10 +117,7 @@
# </a>
# From Steffen Thorsen (2010-03-10):
-# We got these changes from the Australian Antarctic Division:
-# - Macquarie Island will stay on UTC+11 for winter and therefore not
-# switch back from daylight savings time when other parts of Australia do
-# on 4 April.
+# We got these changes from the Australian Antarctic Division: ...
#
# - Casey station reverted to its normal time of UTC+8 on 5 March 2010.
# The change to UTC+11 is being considered as a regular summer thing but
@@ -159,9 +128,6 @@
#
# - Mawson station stays on UTC+5.
#
-# In addition to the Rule changes for Casey/Davis, it means that Macquarie
-# will no longer be like Hobart and will have to have its own Zone created.
-#
# Background:
# <a href="http://www.timeanddate.com/news/time/antartica-time-changes-2010.html">
# http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
@@ -188,12 +154,6 @@
6:00 - MAWT 2009 Oct 18 2:00
# Mawson Time
5:00 - MAWT
-Zone Antarctica/Macquarie 0 - zzz 1911
- 10:00 - EST 1916 Oct 1 2:00
- 10:00 1:00 EST 1917 Feb
- 10:00 AusAQ EST 1967
- 10:00 ATAQ EST 2010 Apr 4 3:00
- 11:00 - MIST # Macquarie Island Time
# References:
# <a href="http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html">
# Casey Weather (1998-02-26)
diff -r 883a1fbc5c1a -r d1563025e086 make/sun/javazic/tzdata/asia
--- a/make/sun/javazic/tzdata/asia Wed May 22 16:12:05 2013 +0100
+++ b/make/sun/javazic/tzdata/asia Fri Jun 07 19:44:57 2013 +0100
@@ -2314,11 +2314,20 @@
# http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html
# </a>
-# From Arthur David Olson (2012-03-27):
-# The timeanddate article for 2012 says that "the end date has not yet been
-# announced" and that "Last year, both...paused daylight saving time during...
-# Ramadan. It is not yet known [for] 2012."
-# For now, assume both switch back on the last Friday in September. XXX
+# From Steffen Thorsen (2013-03-26):
+# The following news sources tells that Palestine will "start daylight saving
+# time from midnight on Friday, March 29, 2013" (translated).
+# [These are in Arabic and are for Gaza and for Ramallah, respectively.]
+# http://www.samanews.com/index.php?act=Show&id=154120
+# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html
+
+# From Paul Eggert (2013-04-15):
+# For future dates, guess the last Thursday in March at 24:00 through
+# the first Friday on or after September 21 at 01:00. This is consistent with
+# the predictions in today's editions of the following URLs,
+# which are for Gaza and Hebron respectively:
+# http://www.timeanddate.com/worldclock/timezone.html?n=702
+# http://www.timeanddate.com/worldclock/timezone.html?n=2364
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
@@ -2332,19 +2341,20 @@
Rule Palestine 1999 2003 - Oct Fri>=15 0:00 0 -
Rule Palestine 2004 only - Oct 1 1:00 0 -
Rule Palestine 2005 only - Oct 4 2:00 0 -
-Rule Palestine 2006 2008 - Apr 1 0:00 1:00 S
+Rule Palestine 2006 2007 - Apr 1 0:00 1:00 S
Rule Palestine 2006 only - Sep 22 0:00 0 -
Rule Palestine 2007 only - Sep Thu>=8 2:00 0 -
-Rule Palestine 2008 only - Aug lastFri 0:00 0 -
-Rule Palestine 2009 only - Mar lastFri 0:00 1:00 S
-Rule Palestine 2009 only - Sep Fri>=1 2:00 0 -
-Rule Palestine 2010 only - Mar lastSat 0:01 1:00 S
+Rule Palestine 2008 2009 - Mar lastFri 0:00 1:00 S
+Rule Palestine 2008 only - Sep 1 0:00 0 -
+Rule Palestine 2009 only - Sep Fri>=1 1:00 0 -
+Rule Palestine 2010 only - Mar 26 0:00 1:00 S
Rule Palestine 2010 only - Aug 11 0:00 0 -
-
-# From Arthur David Olson (2011-09-20):
-# 2011 transitions per http://www.timeanddate.com as of 2011-09-20.
-# From Paul Eggert (2012-10-12):
-# 2012 transitions per http://www.timeanddate.com as of 2012-10-12.
+Rule Palestine 2011 only - Apr 1 0:01 1:00 S
+Rule Palestine 2011 only - Aug 1 0:00 0 -
+Rule Palestine 2011 only - Aug 30 0:00 1:00 S
+Rule Palestine 2011 only - Sep 30 0:00 0 -
+Rule Palestine 2012 max - Mar lastThu 24:00 1:00 S
+Rule Palestine 2012 max - Sep Fri>=21 1:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
@@ -2352,26 +2362,20 @@
2:00 EgyptAsia EE%sT 1967 Jun 5
2:00 Zion I%sT 1996
2:00 Jordan EE%sT 1999
- 2:00 Palestine EE%sT 2011 Apr 2 12:01
- 2:00 1:00 EEST 2011 Aug 1
- 2:00 - EET 2012 Mar 30
- 2:00 1:00 EEST 2012 Sep 21 1:00
- 2:00 - EET
+ 2:00 Palestine EE%sT 2008 Aug 29 0:00
+ 2:00 - EET 2008 Sep
+ 2:00 Palestine EE%sT 2010
+ 2:00 - EET 2010 Mar 27 0:01
+ 2:00 Palestine EE%sT 2011 Aug 1
+ 2:00 - EET 2012
+ 2:00 Palestine EE%sT
Zone Asia/Hebron 2:20:23 - LMT 1900 Oct
2:00 Zion EET 1948 May 15
2:00 EgyptAsia EE%sT 1967 Jun 5
2:00 Zion I%sT 1996
2:00 Jordan EE%sT 1999
- 2:00 Palestine EE%sT 2008 Aug
- 2:00 1:00 EEST 2008 Sep
- 2:00 Palestine EE%sT 2011 Apr 1 12:01
- 2:00 1:00 EEST 2011 Aug 1
- 2:00 - EET 2011 Aug 30
- 2:00 1:00 EEST 2011 Sep 30 3:00
- 2:00 - EET 2012 Mar 30
- 2:00 1:00 EEST 2012 Sep 21 1:00
- 2:00 - EET
+ 2:00 Palestine EE%sT
# Paracel Is
# no information
diff -r 883a1fbc5c1a -r d1563025e086 make/sun/javazic/tzdata/australasia
--- a/make/sun/javazic/tzdata/australasia Wed May 22 16:12:05 2013 +0100
+++ b/make/sun/javazic/tzdata/australasia Fri Jun 07 19:44:57 2013 +0100
@@ -241,9 +241,26 @@
# no times are set
#
# Macquarie
-# permanent occupation (scientific station) since 1948;
-# sealing and penguin oil station operated 1888/1917
-# like Australia/Hobart
+# Permanent occupation (scientific station) 1911-1915 and since 25 March 1948;
+# sealing and penguin oil station operated Nov 1899 to Apr 1919. See the
+# Tasmania Parks & Wildlife Service history of sealing at Macquarie Island
+# <http://www.parks.tas.gov.au/index.aspx?base=1828>
+# <http://www.parks.tas.gov.au/index.aspx?base=1831>.
+# Guess that it was like Australia/Hobart while inhabited before 2010.
+#
+# From Steffen Thorsen (2010-03-10):
+# We got these changes from the Australian Antarctic Division:
+# - Macquarie Island will stay on UTC+11 for winter and therefore not
+# switch back from daylight savings time when other parts of Australia do
+# on 4 April.
+Zone Antarctica/Macquarie 0 - zzz 1899 Nov
+ 10:00 - EST 1916 Oct 1 2:00
+ 10:00 1:00 EST 1917 Feb
+ 10:00 Aus EST 1919 Apr
+ 0 - zzz 1948 Mar 25
+ 10:00 Aus EST 1967
+ 10:00 AT EST 2010 Apr 4 3:00
+ 11:00 - MIST # Macquarie I Standard Time
# Christmas
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
diff -r 883a1fbc5c1a -r d1563025e086 make/sun/javazic/tzdata/southamerica
--- a/make/sun/javazic/tzdata/southamerica Wed May 22 16:12:05 2013 +0100
+++ b/make/sun/javazic/tzdata/southamerica Fri Jun 07 19:44:57 2013 +0100
@@ -1589,16 +1589,16 @@
# forward 60 minutes, in all the territory of the Paraguayan Republic.
# ...
Rule Para 2010 max - Oct Sun>=1 0:00 1:00 S
-Rule Para 2010 max - Apr Sun>=8 0:00 0 -
+Rule Para 2010 2012 - Apr Sun>=8 0:00 0 -
#
# From Steffen Thorsen (2013-03-07):
# Paraguay will end DST on 2013-03-24 00:00....
-# They do not tell if this will be a permanent change or just this year....
# http://www.ande.gov.py/interna.php?id=1075
#
-# From Paul Eggert (2013-03-07):
-# For now, assume it's just this year.
-Rule Para 2013 only - Mar 24 0:00 0 -
+# From Carlos Raul Perasso (2013-03-15):
+# The change in Paraguay is now final. Decree number 10780
+# http://www.presidencia.gov.py/uploads/pdf/presidencia-3b86ff4b691c79d4f5927ca964922ec74772ce857c02ca054a52a37b49afc7fb.pdf
+Rule Para 2013 max - Mar Sun>=22 0:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Asuncion -3:50:40 - LMT 1890
diff -r 883a1fbc5c1a -r d1563025e086 make/sun/javazic/tzdata/zone.tab
--- a/make/sun/javazic/tzdata/zone.tab Wed May 22 16:12:05 2013 +0100
+++ b/make/sun/javazic/tzdata/zone.tab Fri Jun 07 19:44:57 2013 +0100
@@ -65,7 +65,6 @@
AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok
AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie
AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I
-AQ -5430+15857 Antarctica/Macquarie Macquarie Island Station, Macquarie Island
AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF)
AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, MN, SE, SF)
AR -2447-06525 America/Argentina/Salta (SA, LP, NQ, RN)
@@ -81,6 +80,7 @@
AS -1416-17042 Pacific/Pago_Pago
AT +4813+01620 Europe/Vienna
AU -3133+15905 Australia/Lord_Howe Lord Howe Island
+AU -5430+15857 Antarctica/Macquarie Macquarie Island
AU -4253+14719 Australia/Hobart Tasmania - most locations
AU -3956+14352 Australia/Currie Tasmania - King Island
AU -3749+14458 Australia/Melbourne Victoria
diff -r 883a1fbc5c1a -r d1563025e086 make/sun/text/Makefile
--- a/make/sun/text/Makefile Wed May 22 16:12:05 2013 +0100
+++ b/make/sun/text/Makefile Fri Jun 07 19:44:57 2013 +0100
@@ -86,7 +86,6 @@
-sourcepath $(TEXT_SRCDIR) \
$(BIRULES) $(BIINFO)
$(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
- -Xbootclasspath/a:$(ABS_OUTPUTDIR)/classes \
-jar $(GENERATEBREAKITERATORDATA_JARFILE) \
-o $(CLASSDESTDIR)/sun/text/resources \
-spec $(UNICODEDATA)/UnicodeData.txt \
diff -r 883a1fbc5c1a -r d1563025e086 make/tools/src/build/tools/javazic/Rule.java
--- a/make/tools/src/build/tools/javazic/Rule.java Wed May 22 16:12:05 2013 +0100
+++ b/make/tools/src/build/tools/javazic/Rule.java Fri Jun 07 19:44:57 2013 +0100
@@ -119,7 +119,7 @@
r1.getDay(), r1.getTime().getTime());
long t2 = Time.getLocalTime(y, r2.getMonth(),
r2.getDay(), r2.getTime().getTime());
- return (int)(t1 - t2);
+ return (t1 > t2) ? 1 : (t1 < t2) ? -1 : 0;
}
public boolean equals(Object o) {
return this == o;
diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java
--- a/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java Wed May 22 16:12:05 2013 +0100
+++ b/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java Fri Jun 07 19:44:57 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -404,8 +404,8 @@
}
return skey;
} else if (algorithm.equals("TlsPremasterSecret")) {
- // return entire secret
- return new SecretKeySpec(secret, "TlsPremasterSecret");
+ // remove leading zero bytes per RFC 5246 Section 8.1.2
+ return new SecretKeySpec(KeyUtil.trimZeroes(secret), "TlsPremasterSecret");
} else {
throw new NoSuchAlgorithmException("Unsupported secret key "
+ "algorithm: "+ algorithm);
diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java Wed May 22 16:12:05 2013 +0100
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java Fri Jun 07 19:44:57 2013 +0100
@@ -93,7 +93,8 @@
*/
static enum Settings {
GTK_FONT_NAME,
- GTK_ICON_SIZES
+ GTK_ICON_SIZES,
+ GTK_BUTTON_ORDER
}
/* Custom regions are needed for representing regions that don't exist
diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Wed May 22 16:12:05 2013 +0100
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Fri Jun 07 19:44:57 2013 +0100
@@ -539,6 +539,14 @@
}
}
+ /* If gtk-alternative-button-order is set to true, isYesLast needs to be false */
+ Boolean buttonOrder = Boolean.TRUE;
+ Object orderSetting = GTKEngine.INSTANCE.getSetting(GTKEngine.Settings.GTK_BUTTON_ORDER);
+ if (orderSetting instanceof Boolean) {
+ Boolean order = (Boolean) orderSetting;
+ if (Boolean.TRUE.equals(order))
+ buttonOrder = Boolean.FALSE;
+ }
Object[] defaults = new Object[] {
"ArrowButton.size", Integer.valueOf(13),
@@ -818,7 +826,7 @@
"OptionPane.windowBindings", new Object[] {
"ESCAPE", "close" },
"OptionPane.buttonClickThreshhold", new Integer(500),
- "OptionPane.isYesLast", Boolean.TRUE,
+ "OptionPane.isYesLast", buttonOrder,
"OptionPane.font", new FontLazyValue(Region.OPTION_PANE),
"Panel.font", new FontLazyValue(Region.PANEL),
diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/sun/font/FileFontStrike.java
--- a/src/share/classes/sun/font/FileFontStrike.java Wed May 22 16:12:05 2013 +0100
+++ b/src/share/classes/sun/font/FileFontStrike.java Fri Jun 07 19:44:57 2013 +0100
@@ -747,14 +747,9 @@
return origMinX;
}
- long pixelData;
- if (StrikeCache.nativeAddressSize == 4) {
- pixelData = 0xffffffff &
- StrikeCache.unsafe.getInt(ptr + StrikeCache.pixelDataOffset);
- } else {
- pixelData =
- StrikeCache.unsafe.getLong(ptr + StrikeCache.pixelDataOffset);
- }
+ long pixelData =
+ StrikeCache.unsafe.getAddress(ptr + StrikeCache.pixelDataOffset);
+
if (pixelData == 0L) {
return origMinX;
}
diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/sun/font/GlyphList.java
--- a/src/share/classes/sun/font/GlyphList.java Wed May 22 16:12:05 2013 +0100
+++ b/src/share/classes/sun/font/GlyphList.java Fri Jun 07 19:44:57 2013 +0100
@@ -361,16 +361,10 @@
graybits = new byte[len];
}
}
- long pixelDataAddress;
- if (StrikeCache.nativeAddressSize == 4) {
- pixelDataAddress = 0xffffffff &
- StrikeCache.unsafe.getInt(images[glyphindex] +
+ long pixelDataAddress =
+ StrikeCache.unsafe.getAddress(images[glyphindex] +
StrikeCache.pixelDataOffset);
- } else {
- pixelDataAddress =
- StrikeCache.unsafe.getLong(images[glyphindex] +
- StrikeCache.pixelDataOffset);
- }
+
if (pixelDataAddress == 0L) {
return graybits;
}
diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/sun/security/pkcs11/P11KeyAgreement.java
--- a/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java Wed May 22 16:12:05 2013 +0100
+++ b/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java Fri Jun 07 19:44:57 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -330,7 +330,7 @@
// as here we always retrieve the CKA_VALUE even for tokens
// that do not have that bug.
byte[] keyBytes = key.getEncoded();
- byte[] newBytes = P11Util.trimZeroes(keyBytes);
+ byte[] newBytes = KeyUtil.trimZeroes(keyBytes);
if (keyBytes != newBytes) {
key = new SecretKeySpec(newBytes, algorithm);
}
diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/sun/security/pkcs11/P11Signature.java
--- a/src/share/classes/sun/security/pkcs11/P11Signature.java Wed May 22 16:12:05 2013 +0100
+++ b/src/share/classes/sun/security/pkcs11/P11Signature.java Fri Jun 07 19:44:57 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -41,6 +41,7 @@
import sun.security.pkcs11.wrapper.*;
import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
+import sun.security.util.KeyUtil;
/**
* Signature implementation class. This class currently supports the
@@ -687,8 +688,8 @@
BigInteger r = values[0].getPositiveBigInteger();
BigInteger s = values[1].getPositiveBigInteger();
// trim leading zeroes
- byte[] br = P11Util.trimZeroes(r.toByteArray());
- byte[] bs = P11Util.trimZeroes(s.toByteArray());
+ byte[] br = KeyUtil.trimZeroes(r.toByteArray());
+ byte[] bs = KeyUtil.trimZeroes(s.toByteArray());
int k = Math.max(br.length, bs.length);
// r and s each occupy half the array
byte[] res = new byte[k << 1];
diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/sun/security/pkcs11/P11Util.java
--- a/src/share/classes/sun/security/pkcs11/P11Util.java Wed May 22 16:12:05 2013 +0100
+++ b/src/share/classes/sun/security/pkcs11/P11Util.java Fri Jun 07 19:44:57 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -131,20 +131,6 @@
return b;
}
- // trim leading (most significant) zeroes from the result
- static byte[] trimZeroes(byte[] b) {
- int i = 0;
- while ((i < b.length - 1) && (b[i] == 0)) {
- i++;
- }
- if (i == 0) {
- return b;
- }
- byte[] t = new byte[b.length - i];
- System.arraycopy(b, i, t, 0, t.length);
- return t;
- }
-
public static byte[] getMagnitude(BigInteger bi) {
byte[] b = bi.toByteArray();
if ((b.length > 1) && (b[0] == 0)) {
diff -r 883a1fbc5c1a -r d1563025e086 src/share/classes/sun/security/util/KeyUtil.java
--- a/src/share/classes/sun/security/util/KeyUtil.java Wed May 22 16:12:05 2013 +0100
+++ b/src/share/classes/sun/security/util/KeyUtil.java Fri Jun 07 19:44:57 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, 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
@@ -200,5 +200,24 @@
// Don't bother to check against the y^q mod p if safe primes are used.
}
+
+ /**
+ * Trim leading (most significant) zeroes from the result.
+ *
+ * @throws NullPointerException if {@code b} is null
+ */
+ public static byte[] trimZeroes(byte[] b) {
+ int i = 0;
+ while ((i < b.length - 1) && (b[i] == 0)) {
+ i++;
+ }
+ if (i == 0) {
+ return b;
+ }
More information about the distro-pkg-dev
mailing list