Slightly refactor create_genesis_set

qos-client/src/cli.rs

@@ -469,15 +469,11 @@ mod handlers {
 		// Assemble the genesis members from all the public keys in the key
 		// directory
 		let members: Vec<_> = key_files
+			.map(|maybe_key_path| maybe_key_path.unwrap().path())
 			.filter_map(|key_path| {
-				let path = key_path.unwrap().path();
-				let split: Vec<_> = path
-					.file_name()
-					.unwrap()
-					.to_str()
-					.unwrap()
-					.split(".")
-					.collect();
+				let file_name =
+					key_path.file_name().map(|f| f.to_string_lossy()).unwrap();
+				let split: Vec<_> = file_name.split(".").collect();
 
 				// TODO: do we want to dissallow having anything in this folder
 				// that is not a public key for the quorum set?
@@ -486,7 +482,7 @@ mod handlers {
 					return None
 				}
 
-				let public_key = RsaPub::from_pem_file(path)
+				let public_key = RsaPub::from_pem_file(key_path.clone())
 					.expect("Failed to read in rsa pub key.");
 
 				Some(SetupMember {

qos-core/src/protocol/boot.rs

@@ -103,7 +103,7 @@ impl ManifestEnvelope {
 
 			let is_valid_signature = pub_key
 				.verify_sha256(&approval.signature, &self.manifest.hash())
-				.map_err(|e| ProtocolError::CryptoError)?;
+				.map_err(|_| ProtocolError::CryptoError)?;
 			if !is_valid_signature {
 				return Err(ProtocolError::InvalidManifestApproval(
 					approval.clone(),

qos-core/src/protocol/mod.rs

@@ -199,6 +199,7 @@ mod handlers {
 		};
 	}
 
+	// TODO: Add tests for this in the middle of some integration tests
 	pub fn status(
 		req: &ProtocolMsg,
 		state: &mut ProtocolState,

qos-crypto/src/lib.rs

@@ -46,6 +46,7 @@ impl From<openssl::error::ErrorStack> for CryptoError {
 }
 
 /// RSA Private key pair.
+#[derive(Clone)]
 pub struct RsaPair {
 	private_key: Rsa<Private>,
 	public_key: RsaPub,
@@ -158,7 +159,7 @@ impl Deref for RsaPair {
 	}
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct RsaPub {
 	public_key: Rsa<Public>,
 }
@@ -375,10 +376,21 @@ mod test {
 	}
 
 	#[test]
-	fn e2e_envelope_crypto() {
+	fn e2e_envelope_crypto_private_key() {
+		let data = b"a nation that vapes big puffy clouds";
+		let private = RsaPair::generate().unwrap();
+		let envelope = private.envelope_encrypt(data).unwrap();
+		let decrypted = private.envelope_decrypt(&envelope).unwrap();
+
+		assert_eq!(data.to_vec(), decrypted);
+	}
+
+	#[test]
+	fn e2e_envelope_crypto_public_key() {
 		let data = b"a nation that vapes big puffy clouds";
 		let private = RsaPair::generate().unwrap();
-		let envelope = private.public_key.envelope_encrypt(data).unwrap();
+		let public: RsaPub = private.clone().try_into().unwrap();
+		let envelope = public.envelope_encrypt(data).unwrap();
 		let decrypted = private.envelope_decrypt(&envelope).unwrap();
 
 		assert_eq!(data.to_vec(), decrypted);