From 5e2a9ac467bbd2074d74ba15885fccd55ca8c11d Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Wed, 15 Mar 2023 16:32:14 +0900 Subject: [PATCH] Add feature --cfg='feature="std"' --cfg='feature="alloc"' --cfg='feature="once_cell"' --- packaging/extern.patch | 22 ++++++++++++++++++++++ packaging/rust-ring.spec | 6 +++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/packaging/extern.patch b/packaging/extern.patch index d9effc8..104f6ec 100644 --- a/packaging/extern.patch +++ b/packaging/extern.patch @@ -49,3 +49,25 @@ index c3ca499..d947aa7 100644 return Err(error::KeyRejected::wrong_algorithm()); } +diff --git a/src/rsa/padding.rs b/src/rsa/padding.rs +index f6b4cf6..7f1c0ff 100644 +--- a/src/rsa/padding.rs ++++ b/src/rsa/padding.rs +@@ -99,7 +99,7 @@ impl Verification for PKCS1 { + let mut calculated = [0u8; PUBLIC_KEY_PUBLIC_MODULUS_MAX_LEN]; + let calculated = &mut calculated[..mod_bits.as_usize_bytes_rounded_up()]; + pkcs1_encode(&self, m_hash, calculated); +- if m.read_bytes_to_end() != *calculated { ++ if m.read_bytes_to_end().as_slice_less_safe() != calculated { + return Err(error::Unspecified); + } + Ok(()) +@@ -388,7 +388,7 @@ impl Verification for PSS { + let h_prime = pss_digest(self.digest_alg, m_hash, salt); + + // Step 14. +- if h_hash != *h_prime.as_ref() { ++ if h_hash.as_slice_less_safe() != h_prime.as_ref() { + return Err(error::Unspecified); + } + diff --git a/packaging/rust-ring.spec b/packaging/rust-ring.spec index 5e84854..2a546f7 100644 --- a/packaging/rust-ring.spec +++ b/packaging/rust-ring.spec @@ -29,6 +29,8 @@ BuildRequires: rust-once_cell BuildRequires: rust-spin BuildRequires: rust-untrusted +Requires: rust-libc + # ========================================================== # dev-dependencies # ========================================================== @@ -51,7 +53,9 @@ cp %{SOURCE1} . %{rustc_std_build} --crate-type=dylib \ --crate-name=%{real_crate_name} \ %{?rustc_edition:--edition=%{rustc_edition}} \ - --cfg='feature="libc"' \ + --cfg='feature="std"' \ + --cfg='feature="alloc"' \ + --cfg='feature="once_cell"' \ --extern libc=%{_rust_dylibdir}/liblibc.so \ ./src/lib.rs -- 2.7.4