From 0a100acdd2d0533d5c9aa2fe58ff1a52efe716b6 Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Sun, 8 Dec 2019 09:46:30 -0800 Subject: [PATCH] Rename `container` module to `mscmap` Better reflects what it actually is. --- README.md | 2 +- src/consts.rs | 41 --------------------------------- src/lib.rs | 4 ++-- src/{container.rs => mscmap.rs} | 0 4 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 src/consts.rs rename src/{container.rs => mscmap.rs} (100%) diff --git a/README.md b/README.md index 6c59a62..3abe109 100644 --- a/README.md +++ b/README.md @@ -69,9 +69,9 @@ functions of the YubiKey: | 🚧️ | `certificate` | [#22] | Certificates for stored keys | | 🚧 | `chuid` | [#23] | Cardholder Unique Identifier (CHUID) | | ✅️ | `config` | [#24] | Support for reading on-key configuration | -| ⚠️ | `container` | [#25] | MS Container Map Records | | 🚧 | `key` | [#26] | Crypto key management: list, generate, import | | 🚧 | `mgm` | [#26] | Management Key (MGM) support: set, get, derive | +| ⚠️ | `mscmap` | [#25] | MS Container Map Records | | ⚠️ | `msroots` | [#28] | `msroots` file: PKCS#7 formatted certificate store for enterprise trusted roots | Legend: diff --git a/src/consts.rs b/src/consts.rs deleted file mode 100644 index e432fea..0000000 --- a/src/consts.rs +++ /dev/null @@ -1,41 +0,0 @@ -//! Constant values -// TODO(tarcieri): refactor these into enums! - -// Adapted from yubico-piv-tool: -// -// -// Copyright (c) 2014-2016 Yubico AB -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// TODO(tarcieri): document these! -#![allow(missing_docs, non_upper_case_globals)] -#![cfg_attr(not(feature = "untested"), allow(dead_code))] - - - - - diff --git a/src/lib.rs b/src/lib.rs index c763f21..eb0a8c9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -140,13 +140,13 @@ pub mod cccid; pub mod certificate; pub mod chuid; pub mod config; -#[cfg(feature = "untested")] -pub mod container; pub mod error; pub mod key; mod metadata; pub mod mgm; #[cfg(feature = "untested")] +pub mod mscmap; +#[cfg(feature = "untested")] pub mod msroots; pub mod policy; pub mod readers; diff --git a/src/container.rs b/src/mscmap.rs similarity index 100% rename from src/container.rs rename to src/mscmap.rs