Extract OID constants into a separate class

Author: sergezhigunov

src/OpenGost.Security.Cryptography/CryptoConstants.cs

@@ -14,8 +14,4 @@ internal static class CryptoConstants
     public const string Streebog512AlgorithmName = nameof(Streebog512);
     public const string HMACStreebog512AlgorithmName = nameof(HMACStreebog512);
 
-    public const string GostECDsa256OidValue = "1.2.643.7.1.1.1.1";
-    public const string GostECDsa512OidValue = "1.2.643.7.1.1.1.2";
-    public const string Streebog256OidValue = "1.2.643.7.1.1.2.2";
-    public const string Streebog512OidValue = "1.2.643.7.1.1.2.3";
 }

src/OpenGost.Security.Cryptography/ECCurveOidMap.cs

@@ -2,8 +2,6 @@
 
 internal static class ECCurveOidMap
 {
-    #region Constants
-
     private static ECCurve ECCurve256ParamsetTest { get; } = new ECCurve
     {
         CurveType = ECCurve.ECCurveType.PrimeShortWeierstrass,
@@ -415,8 +413,6 @@ internal static class ECCurveOidMap
         },
     };
 
-    #endregion
-
     private static volatile IReadOnlyDictionary<string, ECCurve>? _ecCurveOidDictionary;
 
     private static IReadOnlyDictionary<string, ECCurve> ECCurveOidDictionary
@@ -427,21 +423,21 @@ private static IReadOnlyDictionary<string, ECCurve> ECCurveOidDictionary
             {
                 var ecCurveOidDictionary = new Dictionary<string, ECCurve>
                 {
-                    { "1.2.643.7.1.2.1.1.0", ECCurve256ParamsetTest },
-                    { "1.2.643.7.1.2.1.1.1", ECCurve256ParamsetA },
-                    { "1.2.643.7.1.2.1.1.2", ECCurve256ParamsetB },
-                    { "1.2.643.7.1.2.1.1.3", ECCurve256ParamsetC },
-                    { "1.2.643.7.1.2.1.1.4", ECCurve256ParamsetD },
-                    { "1.2.643.2.2.35.0", ECCurve256ParamsetTest },
-                    { "1.2.643.2.2.35.1", ECCurve256ParamsetB },
-                    { "1.2.643.2.2.35.2", ECCurve256ParamsetC },
-                    { "1.2.643.2.2.35.3", ECCurve256ParamsetD },
-                    { "1.2.643.2.2.36.0", ECCurve256ParamsetB },
-                    { "1.2.643.2.2.36.1", ECCurve256ParamsetD },
-                    { "1.2.643.7.1.2.1.2.0", ECCurve512ParamsetTest },
-                    { "1.2.643.7.1.2.1.2.1", ECCurve512ParamsetA },
-                    { "1.2.643.7.1.2.1.2.2", ECCurve512ParamsetB },
-                    { "1.2.643.7.1.2.1.2.3", ECCurve512ParamsetC },
+                    [Oids.ECCurve256TestParamSet] = ECCurve256ParamsetTest,
+                    [Oids.ECCurve256ParamSetA] = ECCurve256ParamsetA,
+                    [Oids.ECCurve256ParamSetB] = ECCurve256ParamsetB,
+                    [Oids.ECCurve256ParamSetC] = ECCurve256ParamsetC,
+                    [Oids.ECCurve256ParamSetD] = ECCurve256ParamsetD,
+                    [Oids.ECCurveCryptoProTestParamSet] = ECCurve256ParamsetTest,
+                    [Oids.ECCurveCryptoProParamSetA] = ECCurve256ParamsetB,
+                    [Oids.ECCurveCryptoProParamSetB] = ECCurve256ParamsetC,
+                    [Oids.ECCurveCryptoProParamSetC] = ECCurve256ParamsetD,
+                    [Oids.ECCurveCryptoProParamSetXchA] = ECCurve256ParamsetB,
+                    [Oids.ECCurveCryptoProParamSetXchB] = ECCurve256ParamsetD,
+                    [Oids.ECCurve512TestParamSet] = ECCurve512ParamsetTest,
+                    [Oids.ECCurve512ParamSetA] = ECCurve512ParamsetA,
+                    [Oids.ECCurve512ParamSetB] = ECCurve512ParamsetB,
+                    [Oids.ECCurve512ParamSetC] = ECCurve512ParamsetC,
                 };
 
                 _ecCurveOidDictionary = ecCurveOidDictionary;

src/OpenGost.Security.Cryptography/GostECDsaCertificateExtensions.cs

@@ -7,8 +7,6 @@
 namespace System.Security.Cryptography.X509Certificates;
 #pragma warning restore IDE0130
 
-using static CryptoConstants;
-
 /// <summary>
 /// Provides extension methods for retrieving GOST 34.10-2018 <see cref="ECDsa"/> implementations for the
 /// public and private keys of a <see cref="X509Certificate2"/> certificate.
@@ -71,8 +69,7 @@ public static class GostECDsaCertificateExtensions
     /// </exception>
     public static GostECDsa? GetGostECDsaPrivateKey(this X509Certificate2 certificate)
     {
-        if (certificate is null)
-            throw new ArgumentNullException(nameof(certificate));
+        ArgumentNullException.ThrowIfNull(certificate);
 
         if (!certificate.HasPrivateKey || !IsGostECDsa(certificate))
             return null;
@@ -84,12 +81,12 @@ public static class GostECDsaCertificateExtensions
     private static bool IsGostECDsa(X509Certificate2 certificate)
     {
         var value = certificate.PublicKey.Oid.Value;
-        if (value is not GostECDsa256OidValue and not GostECDsa512OidValue)
+        if (value is not Oids.GostECDsa256 and not Oids.GostECDsa512)
             return false;
 
         foreach (var extension in certificate.Extensions)
         {
-            if (extension.Oid?.Value == "2.5.29.15")
+            if (extension.Oid?.Value == Oids.KeyUsage)
             {
                 var ext = (X509KeyUsageExtension)extension;
 

src/OpenGost.Security.Cryptography/GostECDsaManaged.cs

@@ -336,7 +336,7 @@ private void ThrowIfDisposed()
     private static ECCurve GetDefaultCurve(int keySize)
         => keySize switch
         {
-            512 => ECCurve.CreateFromValue("1.2.643.7.1.2.1.2.1"),
-            _ => ECCurve.CreateFromValue("1.2.643.7.1.2.1.1.1"),
+            512 => ECCurve.CreateFromValue(Oids.ECCurve512ParamSetA),
+            _ => ECCurve.CreateFromValue(Oids.ECCurve256ParamSetA),
         };
 }

src/OpenGost.Security.Cryptography/Oids.cs

@@ -0,0 +1,32 @@
+namespace OpenGost.Security.Cryptography;
+
+internal static class Oids
+{
+    // Gost ECDSA
+    internal const string GostECDsa256 = "1.2.643.7.1.1.1.1";
+    internal const string GostECDsa512 = "1.2.643.7.1.1.1.2";
+
+    // Hash Algorithms
+    internal const string Streebog256 = "1.2.643.7.1.1.2.2";
+    internal const string Streebog512 = "1.2.643.7.1.1.2.3";
+
+    // Elliptic Curve identifiers
+    internal const string ECCurveCryptoProTestParamSet = "1.2.643.2.2.35.0";
+    internal const string ECCurveCryptoProParamSetA = "1.2.643.2.2.35.1";
+    internal const string ECCurveCryptoProParamSetB = "1.2.643.2.2.35.2";
+    internal const string ECCurveCryptoProParamSetC = "1.2.643.2.2.35.3";
+    internal const string ECCurveCryptoProParamSetXchA = "1.2.643.2.2.36.0";
+    internal const string ECCurveCryptoProParamSetXchB = "1.2.643.2.2.36.1";
+    internal const string ECCurve256TestParamSet = "1.2.643.7.1.2.1.1.0";
+    internal const string ECCurve256ParamSetA = "1.2.643.7.1.2.1.1.1";
+    internal const string ECCurve256ParamSetB = "1.2.643.7.1.2.1.1.2";
+    internal const string ECCurve256ParamSetC = "1.2.643.7.1.2.1.1.3";
+    internal const string ECCurve256ParamSetD = "1.2.643.7.1.2.1.1.4";
+    internal const string ECCurve512TestParamSet = "1.2.643.7.1.2.1.2.0";
+    internal const string ECCurve512ParamSetA = "1.2.643.7.1.2.1.2.1";
+    internal const string ECCurve512ParamSetB = "1.2.643.7.1.2.1.2.2";
+    internal const string ECCurve512ParamSetC = "1.2.643.7.1.2.1.2.3";
+
+    // Cert Extensions
+    internal const string KeyUsage = "2.5.29.15";
+}

src/OpenGost.Security.Cryptography/OpenGostCryptoConfig.cs

@@ -38,7 +38,7 @@ private static void ConfigureCryptographicServicesCore()
         AddAlgorithm(typeof(HMACStreebog512), HMACStreebog512AlgorithmName, XmlDsigHMACStreebog512Url);
         AddAlgorithm(typeof(GostECDsa256SignatureDescription), XmlDsigGostECDsaStreebog256Url);
         AddAlgorithm(typeof(GostECDsa512SignatureDescription), XmlDsigGostECDsaStreebog512Url);
-        AddOID(Streebog256OidValue, Streebog256AlgorithmName);
-        AddOID(Streebog512OidValue, Streebog512AlgorithmName);
+        AddOID(Oids.Streebog256, Streebog256AlgorithmName);
+        AddOID(Oids.Streebog512, Streebog512AlgorithmName);
     }
 }