Skip to content

Commit e1aa1f9

Browse files
zlukwinsjyao1
authored andcommitted
Fix compilation warning in ring library
The following warning is being fixed: warning: unused imports: `PKCS1`, `PSS` --> ring/src/rsa/padding.rs:21:13 | 21 | pkcs1::{PKCS1, RSA_PKCS1_SHA256, RSA_PKCS1_SHA384, RSA_PKCS1_SHA512}, | ^^^^^ 22 | pss::{PSS, RSA_PSS_SHA256, RSA_PSS_SHA384, RSA_PSS_SHA512}, | ^^^ | = note: `#[warn(unused_imports)]` on by default That warning was already fixed with this patch: briansmith/ring@c4742e0 Once ring library version will be bumped up, this patch could be dropped. Signed-off-by: Zbigniew Lukwinski <[email protected]>
1 parent 2346dd5 commit e1aa1f9

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From c4742e0cae849f08ff410a817c5266af41670b3d Mon Sep 17 00:00:00 2001
2+
From: Brian Smith <[email protected]>
3+
Date: Tue, 9 Jan 2024 10:52:37 -0800
4+
Subject: [PATCH] NFC: Address Clippy unused import warning.
5+
6+
See https://github.com/briansmith/ring/issues/1887 about addressing this
7+
messiness long-term.
8+
---
9+
src/rsa/padding.rs | 4 ++--
10+
1 file changed, 2 insertions(+), 2 deletions(-)
11+
12+
diff --git a/src/rsa/padding.rs b/src/rsa/padding.rs
13+
index faf2422d9..9b79cd0f6 100644
14+
--- a/src/rsa/padding.rs
15+
+++ b/src/rsa/padding.rs
16+
@@ -18,8 +18,8 @@ mod pkcs1;
17+
mod pss;
18+
19+
pub use self::{
20+
- pkcs1::{PKCS1, RSA_PKCS1_SHA256, RSA_PKCS1_SHA384, RSA_PKCS1_SHA512},
21+
- pss::{PSS, RSA_PSS_SHA256, RSA_PSS_SHA384, RSA_PSS_SHA512},
22+
+ pkcs1::{RSA_PKCS1_SHA256, RSA_PKCS1_SHA384, RSA_PKCS1_SHA512},
23+
+ pss::{RSA_PSS_SHA256, RSA_PSS_SHA384, RSA_PSS_SHA512},
24+
};
25+
pub(super) use pkcs1::RSA_PKCS1_SHA1_FOR_LEGACY_USE_ONLY;
26+
27+
--
28+
2.34.1
29+

sh_script/preparation.sh

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ preparation() {
66
git reset --hard 464d367252354418a2c17feb806876d4d89a8508
77
git clean -f -d
88
patch -p 1 -i ../patches/ring.diff
9+
git apply ../patches/0001-NFC-Address-Clippy-unused-import-warning.patch
910
popd
1011
}
1112

0 commit comments

Comments
 (0)