Skip to content

Commit 4017c0c

Browse files
peterdettmanpeterdettman
committed
Round out SEC scheme OIDs
1 parent 68b94e4 commit 4017c0c

1 file changed

Lines changed: 47 additions & 19 deletions

File tree

‎core/src/main/java/org/bouncycastle/asn1/sec/SECObjectIdentifiers.java‎

Lines changed: 47 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
*/
1616
public interface SECObjectIdentifiers
1717
{
18-
/** Base OID: 1.3.132.0 */
19-
static final ASN1ObjectIdentifier ellipticCurve = new ASN1ObjectIdentifier("1.3.132.0");
18+
static final ASN1ObjectIdentifier certicom = new ASN1ObjectIdentifier("1.3.132");
19+
20+
static final ASN1ObjectIdentifier ellipticCurve = certicom.branch("0");
2021

2122
/** sect163k1 OID: 1.3.132.0.1 */
2223
static final ASN1ObjectIdentifier sect163k1 = ellipticCurve.branch("1");
@@ -86,25 +87,52 @@ public interface SECObjectIdentifiers
8687
/** secp256r1 OID: 1.3.132.0.prime256v1 */
8788
static final ASN1ObjectIdentifier secp256r1 = X9ObjectIdentifiers.prime256v1;
8889

89-
static final ASN1ObjectIdentifier secg_scheme = new ASN1ObjectIdentifier("1.3.132.1");
90+
static final ASN1ObjectIdentifier secg_scheme = certicom.branch("1");
91+
92+
static final ASN1ObjectIdentifier dhSinglePass_cofactorDH_recommendedKDF = secg_scheme.branch("1");
93+
static final ASN1ObjectIdentifier dhSinglePass_cofactorDH_specifiedKDF = secg_scheme.branch("2");
94+
static final ASN1ObjectIdentifier mqvSinglePass_recommendedKDF = secg_scheme.branch("3");
95+
static final ASN1ObjectIdentifier mqvSinglePass_specifiedKDF = secg_scheme.branch("4");
96+
static final ASN1ObjectIdentifier mqvFull_recommendedKDF = secg_scheme.branch("5");
97+
static final ASN1ObjectIdentifier mqvFull_specifiedKDF = secg_scheme.branch("6");
98+
static final ASN1ObjectIdentifier ecies_recommendedParameters = secg_scheme.branch("7");
99+
static final ASN1ObjectIdentifier ecies_specifiedParameters = secg_scheme.branch("8");
100+
101+
static final ASN1ObjectIdentifier dhSinglePass_stdDH_kdf_schemes = secg_scheme.branch("11");
102+
103+
static final ASN1ObjectIdentifier dhSinglePass_stdDH_sha224kdf_scheme = dhSinglePass_stdDH_kdf_schemes.branch("0");
104+
static final ASN1ObjectIdentifier dhSinglePass_stdDH_sha256kdf_scheme = dhSinglePass_stdDH_kdf_schemes.branch("1");
105+
static final ASN1ObjectIdentifier dhSinglePass_stdDH_sha384kdf_scheme = dhSinglePass_stdDH_kdf_schemes.branch("2");
106+
static final ASN1ObjectIdentifier dhSinglePass_stdDH_sha512kdf_scheme = dhSinglePass_stdDH_kdf_schemes.branch("3");
107+
108+
static final ASN1ObjectIdentifier ecdh = secg_scheme.branch("12");
109+
static final ASN1ObjectIdentifier ecmqv = secg_scheme.branch("13");
110+
111+
static final ASN1ObjectIdentifier dhSinglePass_cofactorDH_kdf_schemes = secg_scheme.branch("14");
112+
113+
static final ASN1ObjectIdentifier dhSinglePass_cofactorDH_sha224kdf_scheme = dhSinglePass_cofactorDH_kdf_schemes.branch("0");
114+
static final ASN1ObjectIdentifier dhSinglePass_cofactorDH_sha256kdf_scheme = dhSinglePass_cofactorDH_kdf_schemes.branch("1");
115+
static final ASN1ObjectIdentifier dhSinglePass_cofactorDH_sha384kdf_scheme = dhSinglePass_cofactorDH_kdf_schemes.branch("2");
116+
static final ASN1ObjectIdentifier dhSinglePass_cofactorDH_sha512kdf_scheme = dhSinglePass_cofactorDH_kdf_schemes.branch("3");
117+
118+
static final ASN1ObjectIdentifier mqvSinglePass_kdf_schemes = secg_scheme.branch("15");
119+
120+
static final ASN1ObjectIdentifier mqvSinglePass_sha224kdf_scheme = mqvSinglePass_kdf_schemes.branch("0");
121+
static final ASN1ObjectIdentifier mqvSinglePass_sha256kdf_scheme = mqvSinglePass_kdf_schemes.branch("1");
122+
static final ASN1ObjectIdentifier mqvSinglePass_sha384kdf_scheme = mqvSinglePass_kdf_schemes.branch("2");
123+
static final ASN1ObjectIdentifier mqvSinglePass_sha512kdf_scheme = mqvSinglePass_kdf_schemes.branch("3");
90124

91-
static final ASN1ObjectIdentifier dhSinglePass_stdDH_sha224kdf_scheme = secg_scheme.branch("11.0");
92-
static final ASN1ObjectIdentifier dhSinglePass_stdDH_sha256kdf_scheme = secg_scheme.branch("11.1");
93-
static final ASN1ObjectIdentifier dhSinglePass_stdDH_sha384kdf_scheme = secg_scheme.branch("11.2");
94-
static final ASN1ObjectIdentifier dhSinglePass_stdDH_sha512kdf_scheme = secg_scheme.branch("11.3");
125+
static final ASN1ObjectIdentifier mqvFull_kdf_schemes = secg_scheme.branch("16");
95126

96-
static final ASN1ObjectIdentifier dhSinglePass_cofactorDH_sha224kdf_scheme = secg_scheme.branch("14.0");
97-
static final ASN1ObjectIdentifier dhSinglePass_cofactorDH_sha256kdf_scheme = secg_scheme.branch("14.1");
98-
static final ASN1ObjectIdentifier dhSinglePass_cofactorDH_sha384kdf_scheme = secg_scheme.branch("14.2");
99-
static final ASN1ObjectIdentifier dhSinglePass_cofactorDH_sha512kdf_scheme = secg_scheme.branch("14.3");
127+
static final ASN1ObjectIdentifier mqvFull_sha224kdf_scheme = mqvFull_kdf_schemes.branch("0");
128+
static final ASN1ObjectIdentifier mqvFull_sha256kdf_scheme = mqvFull_kdf_schemes.branch("1");
129+
static final ASN1ObjectIdentifier mqvFull_sha384kdf_scheme = mqvFull_kdf_schemes.branch("2");
130+
static final ASN1ObjectIdentifier mqvFull_sha512kdf_scheme = mqvFull_kdf_schemes.branch("3");
100131

101-
static final ASN1ObjectIdentifier mqvSinglePass_sha224kdf_scheme = secg_scheme.branch("15.0");
102-
static final ASN1ObjectIdentifier mqvSinglePass_sha256kdf_scheme = secg_scheme.branch("15.1");
103-
static final ASN1ObjectIdentifier mqvSinglePass_sha384kdf_scheme = secg_scheme.branch("15.2");
104-
static final ASN1ObjectIdentifier mqvSinglePass_sha512kdf_scheme = secg_scheme.branch("15.3");
132+
static final ASN1ObjectIdentifier kdf_algorithms = secg_scheme.branch("17");
105133

106-
static final ASN1ObjectIdentifier mqvFull_sha224kdf_scheme = secg_scheme.branch("16.0");
107-
static final ASN1ObjectIdentifier mqvFull_sha256kdf_scheme = secg_scheme.branch("16.1");
108-
static final ASN1ObjectIdentifier mqvFull_sha384kdf_scheme = secg_scheme.branch("16.2");
109-
static final ASN1ObjectIdentifier mqvFull_sha512kdf_scheme = secg_scheme.branch("16.3");
134+
static final ASN1ObjectIdentifier x9_63_kdf = kdf_algorithms.branch("0");
135+
static final ASN1ObjectIdentifier nist_concatenation_kdf = kdf_algorithms.branch("1");
136+
static final ASN1ObjectIdentifier tls_kdf = kdf_algorithms.branch("2");
137+
static final ASN1ObjectIdentifier ikev2_kdf = kdf_algorithms.branch("3");
110138
}

0 commit comments

Comments
 (0)