Use new de-mut'd rpki-rs Signer trait.

Cargo.toml

@@ -24,7 +24,7 @@ build = "build.rs"
 backoff               = { version = "0.3.0", optional = true }
 base64                = "^0.13"
 basic-cookies         = { version = "^0.1", optional = true }
-bcder                 = "0.6.1-dev"
+bcder                 = "0.6.1"
 bytes                 = "1"
 chrono                = { version = "^0.4", features = ["serde"] }
 clap                  = "^2.33"
@@ -47,7 +47,7 @@ rand                  = "^0.8"
 regex                 = { version = "^1.4", optional = true, default_features = false, features = ["std"] }
 reqwest               = { version = "0.11", features = ["json"] }
 rpassword             = { version = "^5.0", optional = true }
-rpki                  = { version = "0.12.3", features = [ "repository", "rrdp", "serde" ] }
+rpki                  = { version = "0.13.0", features = [ "repository", "rrdp", "serde" ] }
 scrypt                = { version = "^0.6", optional = true, default-features = false }
 serde                 = { version = "^1.0", features = ["derive"] }
 serde_json            = "^1.0"
@@ -189,7 +189,3 @@ shadow-utils = "*"
 
 # END RPM PACKAGING
 # ------------------------------------------------------------------------------
-
-[patch.crates-io]
-bcder = { git = 'https://github.com/NLnetLabs/bcder' }
-rpki = { git = 'https://github.com/ximon18/rpki-rs', branch = '0.12.3-unsigned-from-slice' }

src/commons/api/ca.rs

@@ -2585,10 +2585,10 @@ mod test {
     fn mft_uri() {
         test::test_under_tmp(|d| {
             #[cfg(not(feature = "hsm"))]
-            let mut signer = OpenSslSigner::build(&d).unwrap();
+            let signer = OpenSslSigner::build(&d).unwrap();
 
             #[cfg(feature = "hsm")]
-            let mut signer = OpenSslSigner::build(&d, "dummy", None).unwrap();
+            let signer = OpenSslSigner::build(&d, "dummy", None).unwrap();
 
             let key_id = signer.create_key(PublicKeyFormat::Rsa).unwrap();
             let pub_key = signer.get_key_info(&key_id).unwrap();

src/commons/crypto/signing/dispatch/krillsigner.rs

@@ -50,14 +50,12 @@ impl KrillSigner {
 
     pub fn create_key(&self) -> CryptoResult<KeyIdentifier> {
         self.router
-            .create_key_minimally_locking(PublicKeyFormat::Rsa)
+            .create_key(PublicKeyFormat::Rsa)
             .map_err(crypto::Error::signer)
     }
 
     pub fn destroy_key(&self, key_id: &KeyIdentifier) -> CryptoResult<()> {
-        self.router
-            .destroy_key_minimally_locking(key_id)
-            .map_err(crypto::Error::key_error)
+        self.router.destroy_key(key_id).map_err(crypto::Error::key_error)
     }
 
     pub fn get_key_info(&self, key_id: &KeyIdentifier) -> CryptoResult<PublicKey> {

src/commons/crypto/signing/dispatch/signerprovider.rs

@@ -13,7 +13,7 @@ use crate::commons::{api::Handle, crypto::signers::kmip::KmipSigner};
 ///
 /// Named and modelled after the similar AuthProvider concept that already exists in Krill.
 #[allow(dead_code)] // Needed as we currently only ever construct one variant
-#[derive(Clone, Debug)]
+#[derive(Debug)]
 pub enum SignerProvider {
     OpenSsl(OpenSslSigner),
 
@@ -31,7 +31,7 @@ impl SignerProvider {
     }
 
     #[cfg(feature = "hsm")]
-    pub fn create_registration_key(&mut self) -> Result<(PublicKey, String), SignerError> {
+    pub fn create_registration_key(&self) -> Result<(PublicKey, String), SignerError> {
         match self {
             SignerProvider::OpenSsl(signer) => signer.create_registration_key(),
             #[cfg(feature = "hsm")]
@@ -53,7 +53,7 @@ impl SignerProvider {
     }
 
     #[cfg(feature = "hsm")]
-    pub fn set_handle(&mut self, handle: Handle) {
+    pub fn set_handle(&self, handle: Handle) {
         match self {
             SignerProvider::OpenSsl(signer) => signer.set_handle(handle),
             #[cfg(feature = "hsm")]
@@ -85,7 +85,7 @@ impl Signer for SignerProvider {
 
     type Error = SignerError;
 
-    fn create_key(&mut self, algorithm: PublicKeyFormat) -> Result<Self::KeyId, Self::Error> {
+    fn create_key(&self, algorithm: PublicKeyFormat) -> Result<Self::KeyId, Self::Error> {
         match self {
             SignerProvider::OpenSsl(signer) => signer.create_key(algorithm),
             #[cfg(feature = "hsm")]
@@ -101,7 +101,7 @@ impl Signer for SignerProvider {
         }
     }
 
-    fn destroy_key(&mut self, key: &Self::KeyId) -> Result<(), KeyError<Self::Error>> {
+    fn destroy_key(&self, key: &Self::KeyId) -> Result<(), KeyError<Self::Error>> {
         match self {
             SignerProvider::OpenSsl(signer) => signer.destroy_key(key),
             #[cfg(feature = "hsm")]