infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-06-03 09:12:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

7180907: Jarsigner -verify fails if rsa file used sha-256 with authenticated attributes

Browse Source 
Reviewed-by: xuelei
This commit is contained in:
Weijun Wang 2012-07-21 19:56:53 +08:00
parent 067447f6c6
commit 53170d594f
5 changed files with 99 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jdk/src/share/classes/com/sun/crypto/provider/OAEPParameters.java
View File

@ -105,22 +105,6 @@ public final class OAEPParameters extends AlgorithmParametersSpi {
}
}
private static String convertToStandardName(String internalName) {
if (internalName.equals("SHA")) {
return "SHA-1";
} else if (internalName.equals("SHA224")) {
return "SHA-224";
} else if (internalName.equals("SHA256")) {
return "SHA-256";
} else if (internalName.equals("SHA384")) {
return "SHA-384";
} else if (internalName.equals("SHA512")) {
return "SHA-512";
} else {
return internalName;
}
}
protected void engineInit(byte[] encoded)
throws IOException {
DerInputStream der = new DerInputStream(encoded);
@ -132,8 +116,8 @@ public final class OAEPParameters extends AlgorithmParametersSpi {
DerValue data = datum[i];
if (data.isContextSpecific((byte) 0x00)) {
// hash algid
mdName = convertToStandardName(AlgorithmId.parse
(data.data.getDerValue()).getName());
mdName = AlgorithmId.parse
(data.data.getDerValue()).getName();
} else if (data.isContextSpecific((byte) 0x01)) {
// mgf algid
AlgorithmId val = AlgorithmId.parse(data.data.getDerValue());
@ -142,7 +126,7 @@ public final class OAEPParameters extends AlgorithmParametersSpi {
}
AlgorithmId params = AlgorithmId.parse(
new DerValue(val.getEncodedParams()));
String mgfDigestName = convertToStandardName(params.getName());
String mgfDigestName = params.getName();
if (mgfDigestName.equals("SHA-1")) {
mgfSpec = MGF1ParameterSpec.SHA1;
} else if (mgfDigestName.equals("SHA-224")) {

2
jdk/src/share/classes/sun/security/pkcs/PKCS7.java
View File

@ -882,7 +882,7 @@ public class PKCS7 {
PKCS7 tsToken = tsReply.getToken();
TimestampToken tst = tsReply.getTimestampToken();
if (!tst.getHashAlgorithm().getName().equals("SHA")) {
if (!tst.getHashAlgorithm().getName().equals("SHA-1")) {
throw new IOException("Digest algorithm not SHA-1 in "
+ "timestamp token");
}

8
jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
View File

@ -1298,11 +1298,9 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
try {
String algName =
macData.getDigestAlgName().toUpperCase(Locale.ENGLISH);
if (algName.equals("SHA") ||
algName.equals("SHA1") ||
algName.equals("SHA-1")) {
algName = "SHA1";
}
// Change SHA-1 to SHA1
algName = algName.replace("-", "");
// generate MAC (MAC key is created within JCE)
Mac m = Mac.getInstance("HmacPBE" + algName);

22
jdk/src/share/classes/sun/security/x509/AlgorithmId.java
View File

@ -242,10 +242,7 @@ public class AlgorithmId implements Serializable, DerEncoder {
AlgorithmId paramsId =
AlgorithmId.parse(new DerValue(getEncodedParams()));
String paramsName = paramsId.getName();
if (paramsName.equals("SHA")) {
paramsName = "SHA1";
}
algName = paramsName + "withECDSA";
algName = makeSigAlg(paramsName, "EC");
} catch (IOException e) {
// ignore
}
@ -876,11 +873,11 @@ public class AlgorithmId implements Serializable, DerEncoder {
nameTable = new HashMap<ObjectIdentifier,String>();
nameTable.put(MD5_oid, "MD5");
nameTable.put(MD2_oid, "MD2");
nameTable.put(SHA_oid, "SHA");
nameTable.put(SHA224_oid, "SHA224");
nameTable.put(SHA256_oid, "SHA256");
nameTable.put(SHA384_oid, "SHA384");
nameTable.put(SHA512_oid, "SHA512");
nameTable.put(SHA_oid, "SHA-1");
nameTable.put(SHA224_oid, "SHA-224");
nameTable.put(SHA256_oid, "SHA-256");
nameTable.put(SHA384_oid, "SHA-384");
nameTable.put(SHA512_oid, "SHA-512");
nameTable.put(RSAEncryption_oid, "RSA");
nameTable.put(RSA_oid, "RSA");
nameTable.put(DH_oid, "Diffie-Hellman");
@ -917,11 +914,8 @@ public class AlgorithmId implements Serializable, DerEncoder {
* name and a encryption algorithm name.
*/
public static String makeSigAlg(String digAlg, String encAlg) {
digAlg = digAlg.replace("-", "").toUpperCase(Locale.ENGLISH);
if (digAlg.equalsIgnoreCase("SHA")) digAlg = "SHA1";
encAlg = encAlg.toUpperCase(Locale.ENGLISH);
if (encAlg.equals("EC")) encAlg = "ECDSA";
digAlg = digAlg.replace("-", "");
if (encAlg.equalsIgnoreCase("EC")) encAlg = "ECDSA";
return digAlg + "with" + encAlg;
}

84
jdk/test/sun/security/x509/AlgorithmId/NonStandardNames.java Normal file
View File

@ -0,0 +1,84 @@
/*
* Copyright (c) 2012, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 7180907
* @summary Jarsigner -verify fails if rsa file used sha-256 with authenticated attributes
*/
import java.security.MessageDigest;
import java.security.Signature;
import java.security.cert.X509Certificate;
import sun.security.pkcs.ContentInfo;
import sun.security.pkcs.PKCS7;
import sun.security.pkcs.PKCS9Attribute;
import sun.security.pkcs.PKCS9Attributes;
import sun.security.pkcs.SignerInfo;
import sun.security.tools.CertAndKeyGen;
import sun.security.x509.AlgorithmId;
import sun.security.x509.X500Name;
public class NonStandardNames {
public static void main(String[] args) throws Exception {
byte[] data = "Hello".getBytes();
X500Name n = new X500Name("cn=Me");
CertAndKeyGen cakg = new CertAndKeyGen("RSA", "SHA256withRSA");
cakg.generate(1024);
X509Certificate cert = cakg.getSelfCertificate(n, 1000);
MessageDigest md = MessageDigest.getInstance("SHA-256");
PKCS9Attributes authed = new PKCS9Attributes(new PKCS9Attribute[]{
new PKCS9Attribute(PKCS9Attribute.CONTENT_TYPE_OID, ContentInfo.DATA_OID),
new PKCS9Attribute(PKCS9Attribute.MESSAGE_DIGEST_OID, md.digest(data)),
});
Signature s = Signature.getInstance("SHA256withRSA");
s.initSign(cakg.getPrivateKey());
s.update(authed.getDerEncoding());
byte[] sig = s.sign();
SignerInfo signerInfo = new SignerInfo(
n,
cert.getSerialNumber(),
AlgorithmId.get("SHA-256"),
authed,
AlgorithmId.get("SHA256withRSA"),
sig,
null
);
PKCS7 pkcs7 = new PKCS7(
new AlgorithmId[] {signerInfo.getDigestAlgorithmId()},
new ContentInfo(data),
new X509Certificate[] {cert},
new SignerInfo[] {signerInfo});
if (pkcs7.verify(signerInfo, data) == null) {
throw new Exception("Not verified");
}
}
}