You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
1.3 KiB
55 lines
1.3 KiB
5 years ago
|
From cb46043221156413192aab8b01b885deb72ff133 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Josh Stone <cuviper@gmail.com>
|
||
|
|
Date: Mon, 20 Jul 2020 14:42:53 -0700
|
||
|
|
Subject: [PATCH] Upgrade to opaque-debug 0.3
|
||
|
|
|
||
|
|
---
|
||
|
|
des/src/des.rs | 2 +-
|
||
|
|
des/src/lib.rs | 3 ---
|
||
|
|
des/src/tdes.rs | 8 ++++----
|
||
|
|
3 files changed, 5 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/des/src/des.rs b/des/src/des.rs
|
||
|
|
index 720c2f71153f..971ad9c22424 100644
|
||
|
|
--- a/src/des.rs
|
||
|
|
+++ b/src/des.rs
|
||
|
|
@@ -209,4 +209,4 @@ impl BlockCipher for Des {
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
-impl_opaque_debug!(Des);
|
||
|
|
+opaque_debug::implement!(Des);
|
||
|
|
diff --git a/des/src/lib.rs b/des/src/lib.rs
|
||
|
|
index 735babee09f7..270e75f97af8 100644
|
||
|
|
--- a/src/lib.rs
|
||
|
|
+++ b/src/lib.rs
|
||
|
|
@@ -7,9 +7,6 @@
|
||
|
|
#![forbid(unsafe_code)]
|
||
|
|
#![warn(missing_docs, rust_2018_idioms)]
|
||
|
|
|
||
|
|
-#[macro_use]
|
||
|
|
-extern crate opaque_debug;
|
||
|
|
-
|
||
|
|
pub use block_cipher;
|
||
|
|
|
||
|
|
mod consts;
|
||
|
|
diff --git a/des/src/tdes.rs b/des/src/tdes.rs
|
||
|
|
index 5e213a37e03d..ce0d5bc7beb3 100644
|
||
|
|
--- a/src/tdes.rs
|
||
|
|
+++ b/src/tdes.rs
|
||
|
|
@@ -198,7 +198,7 @@ impl BlockCipher for TdesEee2 {
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
-impl_opaque_debug!(TdesEde3);
|
||
|
|
-impl_opaque_debug!(TdesEee3);
|
||
|
|
-impl_opaque_debug!(TdesEde2);
|
||
|
|
-impl_opaque_debug!(TdesEee2);
|
||
|
|
+opaque_debug::implement!(TdesEde3);
|
||
|
|
+opaque_debug::implement!(TdesEee3);
|
||
|
|
+opaque_debug::implement!(TdesEde2);
|
||
|
|
+opaque_debug::implement!(TdesEee2);
|
||
|
|
--
|
||
|
|
2.26.2
|
||
|
|
|