Mercurial > hg > release > icedtea8-forest-3.0 > jdk
changeset 10754:41fe61722ce9 jdk8u40-b23
Merge
author | lana |
---|---|
date | Thu, 22 Jan 2015 14:09:39 -0800 |
parents | 84a6b7c4437a (current diff) f5d4b107b250 (diff) |
children | 437de3b8d317 4cc9179f6fce 34fd165fb52e |
files | |
diffstat | 4 files changed, 5 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/security/provider/DSA.java Wed Jan 21 12:19:42 2015 -0800 +++ b/src/share/classes/sun/security/provider/DSA.java Thu Jan 22 14:09:39 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, 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 @@ -117,7 +117,6 @@ if (params == null) { throw new InvalidKeyException("DSA private key lacks parameters"); } - checkKey(params); this.params = params; this.presetX = priv.getX(); @@ -149,7 +148,6 @@ if (params == null) { throw new InvalidKeyException("DSA public key lacks parameters"); } - checkKey(params); this.params = params; this.presetY = pub.getY(); @@ -291,16 +289,6 @@ return null; } - protected void checkKey(DSAParams params) throws InvalidKeyException { - // FIPS186-3 states in sec4.2 that a hash function which provides - // a lower security strength than the (L, N) pair ordinarily should - // not be used. - int valueN = params.getQ().bitLength(); - if (valueN > md.getDigestLength()*8) { - throw new InvalidKeyException("Key is too strong for this signature algorithm"); - } - } - private BigInteger generateR(BigInteger p, BigInteger q, BigInteger g, BigInteger k) { BigInteger temp = g.modPow(k, p); @@ -480,14 +468,6 @@ } } - @Override - protected void checkKey(DSAParams params) throws InvalidKeyException { - int valueL = params.getP().bitLength(); - if (valueL > 1024) { - throw new InvalidKeyException("Key is too long for this algorithm"); - } - } - /* * Please read bug report 4044247 for an alternative, faster, * NON-FIPS approved method to generate K
--- a/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties Wed Jan 21 12:19:42 2015 -0800 +++ b/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties Thu Jan 22 14:09:39 2015 -0800 @@ -104,7 +104,7 @@ HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u30DE\u30B9\u30C8\u30D8\u30C3\u30C9\u56F3\u5F62 HELP_ABOUT_DIALOG_MASTHEAD_TITLE=JConsole\u306B\u3064\u3044\u3066 HELP_ABOUT_DIALOG_TITLE=JConsole: \u60C5\u5831 -HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://docs.oracle.com/javase/{0}/docs/technotes/guides/management/jconsole.html +HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=https://docs.oracle.com/javase/{0}/docs/technotes/guides/management/jconsole.html HELP_MENU_ABOUT_TITLE=JConsole\u306B\u3064\u3044\u3066(&A) HELP_MENU_USER_GUIDE_TITLE=\u30AA\u30F3\u30E9\u30A4\u30F3\u30FB\u30E6\u30FC\u30B6\u30FC\u30FB\u30AC\u30A4\u30C9(&U) HELP_MENU_TITLE=\u30D8\u30EB\u30D7(&H)
--- a/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties Wed Jan 21 12:19:42 2015 -0800 +++ b/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties Thu Jan 22 14:09:39 2015 -0800 @@ -104,7 +104,7 @@ HELP_ABOUT_DIALOG_MASTHEAD_ACCESSIBLE_NAME=\u62A5\u5934\u56FE HELP_ABOUT_DIALOG_MASTHEAD_TITLE=\u5173\u4E8E JConsole HELP_ABOUT_DIALOG_TITLE=JConsole: \u5173\u4E8E -HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=http://docs.oracle.com/javase/{0}/docs/technotes/guides/management/jconsole.html +HELP_ABOUT_DIALOG_USER_GUIDE_LINK_URL=https://docs.oracle.com/javase/{0}/docs/technotes/guides/management/jconsole.html HELP_MENU_ABOUT_TITLE=\u5173\u4E8E JConsole(&A) HELP_MENU_USER_GUIDE_TITLE=\u8054\u673A\u7528\u6237\u6307\u5357(&U) HELP_MENU_TITLE=\u5E2E\u52A9(&H)
--- a/test/sun/security/provider/DSA/TestDSA2.java Wed Jan 21 12:19:42 2015 -0800 +++ b/test/sun/security/provider/DSA/TestDSA2.java Thu Jan 22 14:09:39 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2015, 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 @@ -50,7 +50,7 @@ public static void main(String[] args) throws Exception { boolean[] expectedToPass = { true, true, true }; test(1024, expectedToPass); - boolean[] expectedToPass2 = { false, true, true }; + boolean[] expectedToPass2 = { true, true, true }; test(2048, expectedToPass2); }