From ed6f408063b3e2703ea2d4a23fe96f60c073052f Mon Sep 17 00:00:00 2001
From: Jean-Michel Picod <jmichel@google.com>
Date: Thu, 20 Feb 2020 17:09:08 +0100
Subject: [PATCH] Address comments on pull-request
---
build.rs | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/build.rs b/build.rs
index dfbe063..70844b0 100644
--- a/build.rs
+++ b/build.rs
@@ -52,12 +52,6 @@ fn main() {
let priv_key_vec = pkey.private_key().to_vec();
let key_len = priv_key_vec.len();
- assert!(
- key_len >= 30,
- "Invalid private key (too small): {} ({:#?})",
- priv_key_hex,
- priv_key_vec,
- );
assert!(
key_len <= 33,
"Invalid private key (too big): {} ({:#?})",
@@ -68,8 +62,7 @@ fn main() {
// Copy OpenSSL generated key to our vec, starting from the end
let mut output_vec = [0u8; 32];
let min_key_len = std::cmp::min(key_len, 32);
- output_vec[32usize.saturating_sub(min_key_len)..]
- .copy_from_slice(&priv_key_vec[key_len.saturating_sub(min_key_len)..]);
+ output_vec[32 - min_key_len..].copy_from_slice(&priv_key_vec[key_len - min_key_len..]);
// Create the raw private key out of the OpenSSL data
let mut priv_key_bin_file = File::create(&priv_key_bin_path).unwrap();
--
GitLab