Skip to content

Commit 4e430ff

Browse files
XueleiFanXueleiFan
committedFeb 18, 2020
8239264: Clearup the legacy ObjectIdentifier constructor from int array
Reviewed-by: jnimeh
·
JEP-429-branchpoint
1 parent 8aff5bd commit 4e430ff

26 files changed

+408
-688
lines changed
 

‎src/java.base/macosx/classes/apple/security/KeychainStore.java

+7-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2011, 2020, 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
@@ -89,12 +89,13 @@ class TrustedCertEntry {
8989
private Hashtable<String, Object> entries = new Hashtable<>();
9090

9191
/**
92-
* Algorithm identifiers and corresponding OIDs for the contents of the PKCS12 bag we get from the Keychain.
92+
* Algorithm identifiers and corresponding OIDs for the contents of the
93+
* PKCS12 bag we get from the Keychain.
9394
*/
94-
private static final int keyBag[] = {1, 2, 840, 113549, 1, 12, 10, 1, 2};
95-
private static final int pbeWithSHAAnd3KeyTripleDESCBC[] = {1, 2, 840, 113549, 1, 12, 1, 3};
96-
private static ObjectIdentifier PKCS8ShroudedKeyBag_OID;
97-
private static ObjectIdentifier pbeWithSHAAnd3KeyTripleDESCBC_OID;
95+
private static ObjectIdentifier PKCS8ShroudedKeyBag_OID =
96+
ObjectIdentifier.of("1.2.840.113549.1.12.10.1.2");
97+
private static ObjectIdentifier pbeWithSHAAnd3KeyTripleDESCBC_OID =
98+
ObjectIdentifier.of("1.2.840.113549.1.12.1.3");
9899

99100
/**
100101
* Constnats used in PBE decryption.
@@ -104,16 +105,6 @@ class TrustedCertEntry {
104105

105106
private static final Debug debug = Debug.getInstance("keystore");
106107

107-
static {
108-
jdk.internal.loader.BootLoader.loadLibrary("osxsecurity");
109-
try {
110-
PKCS8ShroudedKeyBag_OID = new ObjectIdentifier(keyBag);
111-
pbeWithSHAAnd3KeyTripleDESCBC_OID = new ObjectIdentifier(pbeWithSHAAnd3KeyTripleDESCBC);
112-
} catch (IOException ioe) {
113-
// should not happen
114-
}
115-
}
116-
117108
private static void permissionCheck() {
118109
SecurityManager sec = System.getSecurityManager();
119110

‎src/java.base/share/classes/com/sun/crypto/provider/DHPrivateKey.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2020, 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
@@ -72,8 +72,6 @@ final class DHPrivateKey implements PrivateKey,
7272
// the private-value length (optional)
7373
private int l;
7474

75-
private int DH_data[] = { 1, 2, 840, 113549, 1, 3, 1 };
76-
7775
/**
7876
* Make a DH private key out of a private value <code>x</code>, a prime
7977
* modulus <code>p</code>, and a base generator <code>g</code>.
@@ -220,7 +218,7 @@ public synchronized byte[] getEncoded() {
220218
DerOutputStream algid = new DerOutputStream();
221219

222220
// store OID
223-
algid.putOID(new ObjectIdentifier(DH_data));
221+
algid.putOID(DHPublicKey.DH_OID);
224222
// encode parameters
225223
DerOutputStream params = new DerOutputStream();
226224
params.putInteger(this.p);

‎src/java.base/share/classes/com/sun/crypto/provider/DHPublicKey.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2020, 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
@@ -69,7 +69,9 @@ final class DHPublicKey implements PublicKey,
6969
// the private-value length (optional)
7070
private int l;
7171

72-
private int DH_data[] = { 1, 2, 840, 113549, 1, 3, 1 };
72+
// Note: this OID is used by DHPrivateKey as well.
73+
static ObjectIdentifier DH_OID =
74+
ObjectIdentifier.of("1.2.840.113549.1.3.1");
7375

7476
/**
7577
* Make a DH public key out of a public value <code>y</code>, a prime
@@ -203,7 +205,7 @@ public synchronized byte[] getEncoded() {
203205
DerOutputStream algid = new DerOutputStream();
204206

205207
// store oid in algid
206-
algid.putOID(new ObjectIdentifier(DH_data));
208+
algid.putOID(DH_OID);
207209

208210
// encode parameters
209211
DerOutputStream params = new DerOutputStream();

‎src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java

+5-19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2020, 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
@@ -55,24 +55,10 @@ public final class OAEPParameters extends AlgorithmParametersSpi {
5555
private String mdName;
5656
private MGF1ParameterSpec mgfSpec;
5757
private byte[] p;
58-
private static ObjectIdentifier OID_MGF1;
59-
private static ObjectIdentifier OID_PSpecified;
60-
61-
static {
62-
try {
63-
OID_MGF1 = new ObjectIdentifier(new int[] {1,2,840,113549,1,1,8});
64-
} catch (IOException ioe) {
65-
// should not happen
66-
OID_MGF1 = null;
67-
}
68-
try {
69-
OID_PSpecified =
70-
new ObjectIdentifier(new int[] {1,2,840,113549,1,1,9});
71-
} catch (IOException ioe) {
72-
// should not happen
73-
OID_PSpecified = null;
74-
}
75-
}
58+
private static ObjectIdentifier OID_MGF1 =
59+
ObjectIdentifier.of("1.2.840.113549.1.1.8");
60+
private static ObjectIdentifier OID_PSpecified =
61+
ObjectIdentifier.of("1.2.840.113549.1.1.9");
7662

7763
public OAEPParameters() {
7864
}

‎src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java

+21-50
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2020, 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
@@ -90,57 +90,28 @@
9090
*
9191
* </pre>
9292
*/
93-
9493
abstract class PBES2Parameters extends AlgorithmParametersSpi {
9594

96-
private static final int pkcs5PBKDF2[] =
97-
{1, 2, 840, 113549, 1, 5, 12};
98-
private static final int pkcs5PBES2[] =
99-
{1, 2, 840, 113549, 1, 5, 13};
100-
private static final int hmacWithSHA1[] =
101-
{1, 2, 840, 113549, 2, 7};
102-
private static final int hmacWithSHA224[] =
103-
{1, 2, 840, 113549, 2, 8};
104-
private static final int hmacWithSHA256[] =
105-
{1, 2, 840, 113549, 2, 9};
106-
private static final int hmacWithSHA384[] =
107-
{1, 2, 840, 113549, 2, 10};
108-
private static final int hmacWithSHA512[] =
109-
{1, 2, 840, 113549, 2, 11};
110-
private static final int aes128CBC[] =
111-
{2, 16, 840, 1, 101, 3, 4, 1, 2};
112-
private static final int aes192CBC[] =
113-
{2, 16, 840, 1, 101, 3, 4, 1, 22};
114-
private static final int aes256CBC[] =
115-
{2, 16, 840, 1, 101, 3, 4, 1, 42};
116-
117-
private static ObjectIdentifier pkcs5PBKDF2_OID;
118-
private static ObjectIdentifier pkcs5PBES2_OID;
119-
private static ObjectIdentifier hmacWithSHA1_OID;
120-
private static ObjectIdentifier hmacWithSHA224_OID;
121-
private static ObjectIdentifier hmacWithSHA256_OID;
122-
private static ObjectIdentifier hmacWithSHA384_OID;
123-
private static ObjectIdentifier hmacWithSHA512_OID;
124-
private static ObjectIdentifier aes128CBC_OID;
125-
private static ObjectIdentifier aes192CBC_OID;
126-
private static ObjectIdentifier aes256CBC_OID;
127-
128-
static {
129-
try {
130-
pkcs5PBKDF2_OID = new ObjectIdentifier(pkcs5PBKDF2);
131-
pkcs5PBES2_OID = new ObjectIdentifier(pkcs5PBES2);
132-
hmacWithSHA1_OID = new ObjectIdentifier(hmacWithSHA1);
133-
hmacWithSHA224_OID = new ObjectIdentifier(hmacWithSHA224);
134-
hmacWithSHA256_OID = new ObjectIdentifier(hmacWithSHA256);
135-
hmacWithSHA384_OID = new ObjectIdentifier(hmacWithSHA384);
136-
hmacWithSHA512_OID = new ObjectIdentifier(hmacWithSHA512);
137-
aes128CBC_OID = new ObjectIdentifier(aes128CBC);
138-
aes192CBC_OID = new ObjectIdentifier(aes192CBC);
139-
aes256CBC_OID = new ObjectIdentifier(aes256CBC);
140-
} catch (IOException ioe) {
141-
// should not happen
142-
}
143-
}
95+
private static ObjectIdentifier pkcs5PBKDF2_OID =
96+
ObjectIdentifier.of("1.2.840.113549.1.5.12");
97+
private static ObjectIdentifier pkcs5PBES2_OID =
98+
ObjectIdentifier.of("1.2.840.113549.1.5.13");
99+
private static ObjectIdentifier hmacWithSHA1_OID =
100+
ObjectIdentifier.of("1.2.840.113549.2.7");
101+
private static ObjectIdentifier hmacWithSHA224_OID =
102+
ObjectIdentifier.of("1.2.840.113549.2.8");
103+
private static ObjectIdentifier hmacWithSHA256_OID =
104+
ObjectIdentifier.of("1.2.840.113549.2.9");
105+
private static ObjectIdentifier hmacWithSHA384_OID =
106+
ObjectIdentifier.of("1.2.840.113549.2.10");
107+
private static ObjectIdentifier hmacWithSHA512_OID =
108+
ObjectIdentifier.of("1.2.840.113549.2.11");
109+
private static ObjectIdentifier aes128CBC_OID =
110+
ObjectIdentifier.of("2.16.840.1.101.3.4.1.2");
111+
private static ObjectIdentifier aes192CBC_OID =
112+
ObjectIdentifier.of("2.16.840.1.101.3.4.1.22");
113+
private static ObjectIdentifier aes256CBC_OID =
114+
ObjectIdentifier.of("2.16.840.1.101.3.4.1.42");
144115

145116
// the PBES2 algorithm name
146117
private String pbes2AlgorithmName = null;

‎src/java.base/share/classes/java/security/cert/X509CertSelector.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2020, 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
@@ -88,7 +88,7 @@ public class X509CertSelector implements CertSelector {
8888
private static final Debug debug = Debug.getInstance("certpath");
8989

9090
private static final ObjectIdentifier ANY_EXTENDED_KEY_USAGE =
91-
ObjectIdentifier.newInternal(new int[] {2, 5, 29, 37, 0});
91+
ObjectIdentifier.of("2.5.29.37.0");
9292

9393
static {
9494
CertPathHelperImpl.initialize();

‎src/java.base/share/classes/sun/security/pkcs/ContentInfo.java

+30-44
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1996, 2020, 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
@@ -38,50 +38,36 @@
3838
public class ContentInfo {
3939

4040
// pkcs7 pre-defined content types
41-
private static int[] pkcs7 = {1, 2, 840, 113549, 1, 7};
42-
private static int[] data = {1, 2, 840, 113549, 1, 7, 1};
43-
private static int[] sdata = {1, 2, 840, 113549, 1, 7, 2};
44-
private static int[] edata = {1, 2, 840, 113549, 1, 7, 3};
45-
private static int[] sedata = {1, 2, 840, 113549, 1, 7, 4};
46-
private static int[] ddata = {1, 2, 840, 113549, 1, 7, 5};
47-
private static int[] crdata = {1, 2, 840, 113549, 1, 7, 6};
48-
private static int[] nsdata = {2, 16, 840, 1, 113730, 2, 5};
49-
// timestamp token (id-ct-TSTInfo) from RFC 3161
50-
private static int[] tstInfo = {1, 2, 840, 113549, 1, 9, 16, 1, 4};
41+
public static ObjectIdentifier PKCS7_OID =
42+
ObjectIdentifier.of("1.2.840.113549.1.7");
43+
public static ObjectIdentifier DATA_OID =
44+
ObjectIdentifier.of("1.2.840.113549.1.7.1");
45+
public static ObjectIdentifier SIGNED_DATA_OID =
46+
ObjectIdentifier.of("1.2.840.113549.1.7.2");
47+
public static ObjectIdentifier ENVELOPED_DATA_OID =
48+
ObjectIdentifier.of("1.2.840.113549.1.7.3");
49+
public static ObjectIdentifier SIGNED_AND_ENVELOPED_DATA_OID =
50+
ObjectIdentifier.of("1.2.840.113549.1.7.4");
51+
public static ObjectIdentifier DIGESTED_DATA_OID =
52+
ObjectIdentifier.of("1.2.840.113549.1.7.5");
53+
public static ObjectIdentifier ENCRYPTED_DATA_OID =
54+
ObjectIdentifier.of("1.2.840.113549.1.7.6");
55+
5156
// this is for backwards-compatibility with JDK 1.1.x
52-
private static final int[] OLD_SDATA = {1, 2, 840, 1113549, 1, 7, 2};
53-
private static final int[] OLD_DATA = {1, 2, 840, 1113549, 1, 7, 1};
54-
public static ObjectIdentifier PKCS7_OID;
55-
public static ObjectIdentifier DATA_OID;
56-
public static ObjectIdentifier SIGNED_DATA_OID;
57-
public static ObjectIdentifier ENVELOPED_DATA_OID;
58-
public static ObjectIdentifier SIGNED_AND_ENVELOPED_DATA_OID;
59-
public static ObjectIdentifier DIGESTED_DATA_OID;
60-
public static ObjectIdentifier ENCRYPTED_DATA_OID;
61-
public static ObjectIdentifier OLD_SIGNED_DATA_OID;
62-
public static ObjectIdentifier OLD_DATA_OID;
63-
public static ObjectIdentifier NETSCAPE_CERT_SEQUENCE_OID;
64-
public static ObjectIdentifier TIMESTAMP_TOKEN_INFO_OID;
65-
66-
static {
67-
PKCS7_OID = ObjectIdentifier.newInternal(pkcs7);
68-
DATA_OID = ObjectIdentifier.newInternal(data);
69-
SIGNED_DATA_OID = ObjectIdentifier.newInternal(sdata);
70-
ENVELOPED_DATA_OID = ObjectIdentifier.newInternal(edata);
71-
SIGNED_AND_ENVELOPED_DATA_OID = ObjectIdentifier.newInternal(sedata);
72-
DIGESTED_DATA_OID = ObjectIdentifier.newInternal(ddata);
73-
ENCRYPTED_DATA_OID = ObjectIdentifier.newInternal(crdata);
74-
OLD_SIGNED_DATA_OID = ObjectIdentifier.newInternal(OLD_SDATA);
75-
OLD_DATA_OID = ObjectIdentifier.newInternal(OLD_DATA);
76-
/**
77-
* The ASN.1 systax for the Netscape Certificate Sequence
78-
* data type is defined
79-
* <a href=http://wp.netscape.com/eng/security/comm4-cert-download.html>
80-
* here.</a>
81-
*/
82-
NETSCAPE_CERT_SEQUENCE_OID = ObjectIdentifier.newInternal(nsdata);
83-
TIMESTAMP_TOKEN_INFO_OID = ObjectIdentifier.newInternal(tstInfo);
84-
}
57+
public static ObjectIdentifier OLD_SIGNED_DATA_OID =
58+
ObjectIdentifier.of("1.2.840.1113549.1.7.2");
59+
public static ObjectIdentifier OLD_DATA_OID =
60+
ObjectIdentifier.of("1.2.840.1113549.1.7.1");
61+
62+
// The ASN.1 systax for the Netscape Certificate Sequence data type is
63+
// defined at:
64+
// http://wp.netscape.com/eng/security/comm4-cert-download.html
65+
public static ObjectIdentifier NETSCAPE_CERT_SEQUENCE_OID =
66+
ObjectIdentifier.of("2.16.840.1.113730.2.5");
67+
68+
// timestamp token (id-ct-TSTInfo) from RFC 3161
69+
public static ObjectIdentifier TIMESTAMP_TOKEN_INFO_OID =
70+
ObjectIdentifier.of("1.2.840.113549.1.9.16.1.4");
8571

8672
ObjectIdentifier contentType;
8773
DerValue content; // OPTIONAL

‎src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2020, 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
@@ -190,15 +190,14 @@ public class PKCS9Attribute implements DerEncoder {
190190

191191
static { // static initializer for PKCS9_OIDS
192192
for (int i = 1; i < PKCS9_OIDS.length - 2; i++) {
193-
PKCS9_OIDS[i] =
194-
ObjectIdentifier.newInternal(new int[]{1,2,840,113549,1,9,i});
193+
PKCS9_OIDS[i] = ObjectIdentifier.of("1.2.840.113549.1.9." + i);
195194
}
196195
// Initialize SigningCertificate and SignatureTimestampToken
197196
// separately (because their values are out of sequence)
198197
PKCS9_OIDS[PKCS9_OIDS.length - 2] =
199-
ObjectIdentifier.newInternal(new int[]{1,2,840,113549,1,9,16,2,12});
198+
ObjectIdentifier.of("1.2.840.113549.1.9.16.2.12");
200199
PKCS9_OIDS[PKCS9_OIDS.length - 1] =
201-
ObjectIdentifier.newInternal(new int[]{1,2,840,113549,1,9,16,2,14});
200+
ObjectIdentifier.of("1.2.840.113549.1.9.16.2.14");
202201

203202
try {
204203
BYTE_ARRAY_CLASS = Class.forName("[B");
@@ -253,7 +252,7 @@ public class PKCS9Attribute implements DerEncoder {
253252
* that occur in PKCS9, in lower case.
254253
*/
255254
private static final Hashtable<String, ObjectIdentifier> NAME_OID_TABLE =
256-
new Hashtable<String, ObjectIdentifier>(18);
255+
new Hashtable<String, ObjectIdentifier>(17);
257256

258257
static { // static initializer for PCKS9_NAMES
259258
NAME_OID_TABLE.put("emailaddress", PKCS9_OIDS[1]);
@@ -280,7 +279,7 @@ public class PKCS9Attribute implements DerEncoder {
280279
* corresponding attribute value type.
281280
*/
282281
private static final Hashtable<ObjectIdentifier, String> OID_NAME_TABLE =
283-
new Hashtable<ObjectIdentifier, String>(16);
282+
new Hashtable<ObjectIdentifier, String>(17);
284283
static {
285284
OID_NAME_TABLE.put(PKCS9_OIDS[1], EMAIL_ADDRESS_STR);
286285
OID_NAME_TABLE.put(PKCS9_OIDS[2], UNSTRUCTURED_NAME_STR);

0 commit comments

Comments
 (0)
Please sign in to comment.