Skip to content

Commit 9cd5400

Browse files
wangweijwangweij
committedApr 13, 2021
8265138: Simplify DerUtils::checkAlg
Reviewed-by: xuelei
·
JEP-429-branchpoint
1 parent c797511 commit 9cd5400

File tree

3 files changed

+36
-34
lines changed

3 files changed

+36
-34
lines changed
 

‎test/jdk/sun/security/pkcs12/ParamsPreferences.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -236,8 +236,8 @@ static void test(int n, Map<String, ?> sysProps,
236236
checkAlg(data, "110c110110", certAlg);
237237
if (certAlg == PBES2) {
238238
checkAlg(data, "110c11011100", PBKDF2WithHmacSHA1);
239-
checkAlg(data, "110c1101110130", args[i++]);
240-
checkAlg(data, "110c11011110", args[i++]);
239+
checkAlg(data, "110c1101110130", (KnownOIDs)args[i++]);
240+
checkAlg(data, "110c11011110", (KnownOIDs)args[i++]);
241241
checkInt(data, "110c110111011", (int) args[i++]);
242242
} else {
243243
checkInt(data, "110c1101111", (int) args[i++]);
@@ -249,8 +249,8 @@ static void test(int n, Map<String, ?> sysProps,
249249
checkAlg(data, "110c010c01000", keyAlg);
250250
if (keyAlg == PBES2) {
251251
checkAlg(data, "110c010c0100100", PBKDF2WithHmacSHA1);
252-
checkAlg(data, "110c010c010010130", args[i++]);
253-
checkAlg(data, "110c010c0100110", args[i++]);
252+
checkAlg(data, "110c010c010010130", (KnownOIDs)args[i++]);
253+
checkAlg(data, "110c010c0100110", (KnownOIDs)args[i++]);
254254
checkInt(data, "110c010c01001011", (int) args[i++]);
255255
} else {
256256
checkInt(data, "110c010c010011", (int) args[i++]);

‎test/jdk/sun/security/tools/keytool/GenerateAll.java

+19-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -74,18 +74,18 @@ public void beforeTest() throws Exception {
7474
@DataProvider(name = "eddsa")
7575
public Object[][] eddsaData() {
7676
return new Object[][]{
77-
{"eddsa", null, "ed25519"},
78-
{"eddsa", "eddsa", "ed25519"},
79-
{"eddsa", "ed25519", "ed25519"},
77+
{"eddsa", null, Ed25519},
78+
{"eddsa", "eddsa", Ed25519},
79+
{"eddsa", "ed25519", Ed25519},
8080
{"eddsa", "ed448", null},
81-
{"ed25519", null, "ed25519"},
82-
{"ed25519", "eddsa", "ed25519"},
83-
{"ed25519", "ed25519", "ed25519"},
81+
{"ed25519", null, Ed25519},
82+
{"ed25519", "eddsa", Ed25519},
83+
{"ed25519", "ed25519", Ed25519},
8484
{"ed25519", "ed448", null},
85-
{"ed448", null, "ed448"},
86-
{"ed448", "eddsa", "ed448"},
85+
{"ed448", null, Ed448},
86+
{"ed448", "eddsa", Ed448},
8787
{"ed448", "ed25519", null},
88-
{"ed448", "ed448", "ed448"},
88+
{"ed448", "ed448", Ed448},
8989
};
9090
}
9191

@@ -96,7 +96,7 @@ public Object[][] eddsaData() {
9696
* @param expected expected algorithm of generated signature
9797
*/
9898
@Test(dataProvider = "eddsa")
99-
public void eddsaTest(String keyAlg, String sigAlg, String expected)
99+
public void eddsaTest(String keyAlg, String sigAlg, KnownOIDs expected)
100100
throws Exception {
101101
String alias = keyAlg + "-" + sigAlg;
102102
OutputAnalyzer oa = kt0("-genkeypair -alias " + alias
@@ -177,19 +177,22 @@ public void test(String alias, String keyAlg, String sigAlg, String ext,
177177
sigAlg = SignatureUtil.getDefaultSigAlgForKey(pk);
178178
}
179179

180+
KnownOIDs sigOID = KnownOIDs.findMatch(sigAlg);
181+
KnownOIDs keyOID = KnownOIDs.findMatch(keyAlg);
182+
180183
byte[] crt = read(alias + ".self");
181-
DerUtils.checkAlg(crt, "020", sigAlg); // tbsCertificate.signature
182-
DerUtils.checkAlg(crt, "0600", keyAlg); // tbsCertificate.subjectPublicKeyInfo.algorithm
184+
DerUtils.checkAlg(crt, "020", sigOID); // tbsCertificate.signature
185+
DerUtils.checkAlg(crt, "0600", keyOID); // tbsCertificate.subjectPublicKeyInfo.algorithm
183186
assertEquals(
184187
DerUtils.innerDerValue(crt, "02"), // tbsCertificate.signature
185188
DerUtils.innerDerValue(crt, "1")); // signatureAlgorithm
186189

187190
byte[] req = read(alias + ".req");
188-
DerUtils.checkAlg(req, "10", sigAlg); // signatureAlgorithm
189-
DerUtils.checkAlg(req, "0200", keyAlg); // certificationRequestInfo.subjectPKInfo.algorithm
191+
DerUtils.checkAlg(req, "10", sigOID); // signatureAlgorithm
192+
DerUtils.checkAlg(req, "0200", keyOID); // certificationRequestInfo.subjectPKInfo.algorithm
190193

191194
byte[] crl = read(alias + ".crl");
192-
DerUtils.checkAlg(crl, "000", sigAlg); // tbsCertList.signature
195+
DerUtils.checkAlg(crl, "000", sigOID); // tbsCertList.signature
193196
assertEquals(
194197
DerUtils.innerDerValue(crl, "00"), // tbsCertList.signature
195198
DerUtils.innerDerValue(crl, "1")); // signatureAlgorithm

‎test/lib/jdk/test/lib/security/DerUtils.java

+12-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -96,18 +96,17 @@ public static DerValue innerDerValue(byte[] data, String location)
9696
* Ensures that the inner DerValue is the expected ObjectIdentifier.
9797
*/
9898
public static void checkAlg(byte[] der, String location,
99-
Object expected) throws Exception {
100-
ObjectIdentifier oid;
101-
if (expected instanceof ObjectIdentifier) {
102-
oid = (ObjectIdentifier)expected;
103-
} else if (expected instanceof KnownOIDs) {
104-
oid = ObjectIdentifier.of((KnownOIDs) expected);
105-
} else if (expected instanceof String) {
106-
oid = ObjectIdentifier.of(KnownOIDs.findMatch((String)expected));
107-
} else {
108-
throw new IllegalArgumentException(expected.toString());
109-
}
110-
Asserts.assertEQ(innerDerValue(der, location).getOID(), oid);
99+
ObjectIdentifier expected) throws Exception {
100+
Asserts.assertEQ(innerDerValue(der, location).getOID(), expected);
101+
}
102+
103+
/**
104+
* Ensures that the inner DerValue is the expected ObjectIdentifier.
105+
*/
106+
public static void checkAlg(byte[] der, String location,
107+
KnownOIDs expected) throws Exception {
108+
Asserts.assertEQ(innerDerValue(der, location).getOID(),
109+
ObjectIdentifier.of(expected));
111110
}
112111

113112
/**

0 commit comments

Comments
 (0)
Please sign in to comment.