Merge pull request #287 from ptdecker/ptdecker/secrecy-upgrade

Bumped secrecy crate from 0.8.0 to 0.10.3

Author: wiktor-k

.gitignore

@@ -4,4 +4,10 @@
 *DS_Store
 *.patch
 *NVChip
+
+#IDEs
 .vscode
+.idea
+
+#build artifacts
+cryptoki-sys/pkcs11-precompile.h

Cargo.lock

@@ -18,7 +18,7 @@ libloading = "0.8.6"
 log = "0.4.14"
 cryptoki-sys = { path = "../cryptoki-sys", version = "0.4.0" }
 paste = "1.0.6"
-secrecy = "0.8.0"
+secrecy = "0.10.3"
 
 [dev-dependencies]
 num-traits = "0.2.14"

cryptoki/Cargo.toml

@@ -62,8 +62,8 @@ impl Session {
     }
 
     /// Logs a session in using a slice of raw bytes as a PIN. Some dongle drivers allow
-    /// non UTF-8 characters in the PIN and as a result, we aren't guaranteed that we can
-    /// pass in a UTF-8 string to login. Therefore, it's useful to be able to pass in raw bytes
+    /// non UTF-8 characters in the PIN and, as a result, we aren't guaranteed that we can
+    /// pass in a UTF-8 string to `login`. Therefore, it's useful to be able to pass in raw bytes
     /// rather than convert a UTF-8 string to bytes.
     ///
     /// # Arguments

cryptoki/src/session/session_management.rs

@@ -4,8 +4,7 @@
 
 use crate::error::{Error, Result};
 use cryptoki_sys::*;
-use secrecy::SecretString;
-use secrecy::SecretVec;
+use secrecy::{SecretBox, SecretString};
 use std::convert::TryFrom;
 use std::convert::TryInto;
 use std::fmt::Formatter;
@@ -29,7 +28,7 @@ impl Date {
     ///
     /// # Errors
     ///
-    /// If the lengths are invalid a `Error::InvalidValue` will be returned
+    /// If the lengths are invalid, an `Error::InvalidValue` will be returned
     pub fn new_from_str_slice(year: &str, month: &str, day: &str) -> Result<Self> {
         if year.len() != 4 || month.len() != 2 || day.len() != 2 {
             Err(Error::InvalidValue)
@@ -222,22 +221,22 @@ impl From<CK_VERSION> for Version {
 /// A UTC datetime returned by a token's clock if present.
 #[derive(Copy, Clone, Debug)]
 pub struct UtcTime {
-    /// **[Conformance](crate#conformance-notes):**
+    /// **[Conformance](crate#conformance-notes): **
     /// Guaranteed to be in range 0..=9999
     pub year: u16,
-    /// **[Conformance](crate#conformance-notes):**
+    /// **[Conformance](crate#conformance-notes): **
     /// Guaranteed to be in range 0..=99
     pub month: u8,
-    /// **[Conformance](crate#conformance-notes):**
+    /// **[Conformance](crate#conformance-notes): **
     /// Guaranteed to be in range 0..=99
     pub day: u8,
-    /// **[Conformance](crate#conformance-notes):**
+    /// **[Conformance](crate#conformance-notes): **
     /// Guaranteed to be in range 0..=99
     pub hour: u8,
-    /// **[Conformance](crate#conformance-notes):**
+    /// **[Conformance](crate#conformance-notes): **
     /// Guaranteed to be in range 0..=99
     pub minute: u8,
-    /// **[Conformance](crate#conformance-notes):**
+    /// **[Conformance](crate#conformance-notes): **
     /// Guaranteed to be in range 0..=99
     pub second: u8,
 }
@@ -248,7 +247,7 @@ impl UtcTime {
     /// PKCS#11 and ISO are unrelated standards, and this function is provided
     /// only for convenience. ISO format is more widely recognized and parsable
     /// by various date/time utilities, while PKCS#11's internal representation
-    /// of this type is is not used elsewhere.
+    /// of this type is not used elsewhere.
     /// Other than formatting, this crate does not guarantee or enforce any part
     /// of the ISO standard.
     pub fn as_iso8601_string(&self) -> String {
@@ -281,7 +280,7 @@ pub type AuthPin = SecretString;
 /// Secret wrapper for a raw non UTF-8 Pin
 ///
 /// Enable the `serde` feature to add support for Deserialize
-pub type RawAuthPin = SecretVec<u8>;
+pub type RawAuthPin = SecretBox<Vec<u8>>;
 
 #[cfg(test)]
 mod test {