gost94: add OID support

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

Author: lumag

.github/workflows/gost94.yml

@@ -49,7 +49,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.41.0 # MSRV
+          - 1.57.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v3
@@ -63,3 +63,21 @@ jobs:
       - run: cargo test --no-default-features
       - run: cargo test
       - run: cargo test --all-features
+
+  # TODO: merge with test on MSRV bump to 1.57 or higher
+  test-msrv-41:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust:
+          - 1.41.0 # MSRV
+    steps:
+      - uses: actions/checkout@v3
+      - uses: RustCrypto/actions/cargo-cache@master
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+      - run: cargo test
+      - run: cargo test --no-default-features

Cargo.lock

@@ -15,9 +15,10 @@ categories = ["cryptography", "no-std"]
 digest = "0.10.3"
 
 [dev-dependencies]
-digest = { version = "0.10.3", features = ["dev"] }
+digest = { version = "0.10.4", features = ["dev"] }
 hex-literal = "0.2.2"
 
 [features]
 default = ["std"]
 std = ["digest/std"]
+oid = ["digest/oid"] # Enable OID support. WARNING: Bumps MSRV to 1.57

gost94/Cargo.toml

@@ -1,5 +1,7 @@
 #![allow(clippy::many_single_char_names)]
 use core::{convert::TryInto, fmt};
+#[cfg(feature = "oid")]
+use digest::const_oid::{AssociatedOid, ObjectIdentifier};
 use digest::{
     block_buffer::Eager,
     core_api::{
@@ -196,6 +198,15 @@ impl<P: Gost94Params> Gost94Core<P> {
     }
 }
 
+#[cfg(feature = "oid")]
+#[cfg_attr(docsrs, doc(cfg(feature = "oid")))]
+impl<P> AssociatedOid for Gost94Core<P>
+where
+    P: Gost94Params + AssociatedOid,
+{
+    const OID: ObjectIdentifier = P::OID;
+}
+
 impl<P: Gost94Params> HashMarker for Gost94Core<P> {}
 
 impl<P: Gost94Params> BlockSizeUser for Gost94Core<P> {

gost94/src/gost94_core.rs

@@ -1,3 +1,6 @@
+#[cfg(feature = "oid")]
+use digest::const_oid::{AssociatedOid, ObjectIdentifier};
+
 pub(crate) type Block = [u8; 32];
 pub(crate) type SBox = [[u8; 16]; 8];
 
@@ -31,6 +34,14 @@ impl Gost94Params for CryptoProParam {
     const NAME: &'static str = "Gost94CryptoPro";
 }
 
+#[cfg(feature = "oid")]
+impl AssociatedOid for CryptoProParam {
+    /// Per the RFC 4490, this OID is used for the GOST R 34.11-94 hash with CryptoPro params.
+    /// The OID 1.2.643.2.2.30.1 is used in the PublicKey params to denote CryptoPro paramset, but
+    /// not the hash function itself.
+    const OID: ObjectIdentifier = ObjectIdentifier::new_unwrap("1.2.643.2.2.9");
+}
+
 /// S-Box defined in GOST R 34.12-2015.
 #[derive(Copy, Clone, Default)]
 pub struct S2015Param;
@@ -87,3 +98,8 @@ impl Gost94Params for GOST28147UAParam {
     const H0: Block = [0; 32];
     const NAME: &'static str = "Gost28147UA";
 }
+
+#[cfg(feature = "oid")]
+impl AssociatedOid for GOST28147UAParam {
+    const OID: ObjectIdentifier = ObjectIdentifier::new_unwrap("1.2.804.2.1.1.1.1.2.1");
+}

gost94/src/params.rs

@@ -1,3 +1,5 @@
+#[cfg(feature = "oid")]
+use digest::const_oid::{AssociatedOid, ObjectIdentifier};
 use digest::dev::{feed_rand_16mib, fixed_reset_test};
 use digest::new_test;
 use gost94::{Digest, Gost94CryptoPro, Gost94Test, Gost94UA};
@@ -91,3 +93,16 @@ fn gost_ua_engine_tests() {
         hex!("7c536414f8b5b9cc649fdf3cccb2685c1a12622956308e34f31c50ed7b3af56c"),
     );
 }
+
+#[cfg(feature = "oid")]
+#[test]
+fn gost_oid_tests() {
+    assert_eq!(
+        Gost94CryptoPro::OID,
+        ObjectIdentifier::new_unwrap("1.2.643.2.2.9")
+    );
+    assert_eq!(
+        Gost94UA::OID,
+        ObjectIdentifier::new_unwrap("1.2.804.2.1.1.1.1.2.1")
+    );
+}