From 6f35fa93df71bc3f048f5e5593e0dfe32392e762 Mon Sep 17 00:00:00 2001 From: David Hook Date: Tue, 29 Aug 2023 11:46:27 +1000 Subject: WAPI oid update - relates to github bc-java #1478 --- crypto/src/asn1/gm/GMNamedCurves.cs | 1 + crypto/src/asn1/gm/GMObjectIdentifiers.cs | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/crypto/src/asn1/gm/GMNamedCurves.cs b/crypto/src/asn1/gm/GMNamedCurves.cs index 764b031ed..bfa83e6a3 100644 --- a/crypto/src/asn1/gm/GMNamedCurves.cs +++ b/crypto/src/asn1/gm/GMNamedCurves.cs @@ -107,6 +107,7 @@ namespace Org.BouncyCastle.Asn1.GM static GMNamedCurves() { DefineCurve("wapip192v1", GMObjectIdentifiers.wapip192v1, WapiP192V1Holder.Instance); + DefineCurve("wapi192v1", GMObjectIdentifiers.wapi192v1, WapiP192V1Holder.Instance); DefineCurve("sm2p256v1", GMObjectIdentifiers.sm2p256v1, SM2P256V1Holder.Instance); } diff --git a/crypto/src/asn1/gm/GMObjectIdentifiers.cs b/crypto/src/asn1/gm/GMObjectIdentifiers.cs index a17a853f0..65b8e9132 100644 --- a/crypto/src/asn1/gm/GMObjectIdentifiers.cs +++ b/crypto/src/asn1/gm/GMObjectIdentifiers.cs @@ -47,8 +47,22 @@ namespace Org.BouncyCastle.Asn1.GM public static readonly DerObjectIdentifier sm2exchange = sm_scheme.Branch("301.2"); public static readonly DerObjectIdentifier sm2encrypt = sm_scheme.Branch("301.3"); + /** + * + * http://c.gb688.cn/bzgk/gb/showGb?type=online&hcno=252CF0F72A7BE339A56DEA7D774E8994, + * Page 21 only cover from 301.1 to 301.3 + * */ public static readonly DerObjectIdentifier wapip192v1 = sm_scheme.Branch("301.101"); + /** + * + * http://www.chinabwips.org.cn/zqyjgs1.htm and + * http://www.chinabwips.org.cn/doc/101.pdf, + * Page 9 and page 10 states the OID of ECDSA-192 algorithm based on SHA-256 is 1.2.156.11235.1.1.1 + * */ + public static readonly DerObjectIdentifier wapi192v1 = new DerObjectIdentifier("1.2.156.11235.1.1.1"); + public static readonly DerObjectIdentifier wapi192v1_parameters = new DerObjectIdentifier("1.2.156.11235.1.1.2.1"); + public static readonly DerObjectIdentifier sm2encrypt_recommendedParameters = sm2encrypt.Branch("1"); public static readonly DerObjectIdentifier sm2encrypt_specifiedParameters = sm2encrypt.Branch("2"); public static readonly DerObjectIdentifier sm2encrypt_with_sm3 = sm2encrypt.Branch("2.1"); @@ -83,4 +97,4 @@ namespace Org.BouncyCastle.Asn1.GM public static readonly DerObjectIdentifier sm2sign_with_blake2b512 = sm_scheme.Branch("521"); public static readonly DerObjectIdentifier sm2sign_with_blake2s256 = sm_scheme.Branch("522"); } -} \ No newline at end of file +} -- cgit 1.4.1