Update dependencies and code to allow using rpki-rs 0.18.0 (#1166)

* Update rpki-rs, backoff, tokio_rustls, and include rustls_pemfile
* Clean up extern crate statements

Cargo.toml

@@ -21,7 +21,7 @@ exclude = [
 ]
 
 [dependencies]
-backoff = { version = "0.3.0", optional = true }
+backoff = { version = "0.4.0", optional = true }
 base64 = "^0.13"
 basic-cookies = { version = "^0.1", optional = true }
 bytes = "1"
@@ -57,8 +57,12 @@ regex = { version = "1.5.5", optional = true, default_features = false, features
 ] }
 reqwest = { version = "0.11", features = ["json"] }
 rpassword = { version = "^5.0", optional = true }
-rpki = { version = "0.17.2", features = ["ca", "compat", "rrdp"] }
-# rpki                  = { version = "0.16.0-dev", git = "https://github.com/nLnetLabs/rpki-rs", branch = "csr-ca-repo-trailing-slash", features = [ "ca", "compat", "rrdp" ] }
+rpki = { version = "0.18.0", features = ["ca", "compat", "rrdp"] }
+# rpki = { version = "0.17.3-dev", git = "https://github.com/nLnetLabs/rpki-rs", branch = "ring-0.17", features = [
+#     "ca",
+#     "compat",
+#     "rrdp",
+# ] }
 scrypt = { version = "^0.6", optional = true, default-features = false }
 serde = { version = "^1.0", features = ["derive", "rc"] }
 serde_json = "^1.0"
@@ -69,7 +73,8 @@ tokio = { version = "1", features = [
     "signal",
     "time",
 ] }
-tokio-rustls = "^0.22"
+tokio-rustls = "0.24.1"
+rustls-pemfile = "1.0.4" # needed to parse pem files for use in our HTTPS listener
 toml = "^0.5"
 unicode-normalization = { version = "^0.1", optional = true }
 url = { version = "2.3.1", features = ["serde"] }

src/commons/crypto/signing/signers/kmip/signer.rs

@@ -951,7 +951,7 @@ impl From<backoff::Error<SignerError>> for SignerError {
     fn from(err: backoff::Error<SignerError>) -> Self {
         match err {
             backoff::Error::Permanent(err) => err,
-            backoff::Error::Transient(err) => err,
+            backoff::Error::Transient { err, .. } => err,
         }
     }
 }
@@ -961,7 +961,7 @@ where
     E: From<kmip::client::Error>,
 {
     if err.is_connection_error() {
-        backoff::Error::Transient(err.into())
+        backoff::Error::transient(err.into())
     } else {
         backoff::Error::Permanent(err.into())
     }

src/commons/crypto/signing/signers/pkcs11/signer.rs

@@ -1148,22 +1148,22 @@ impl From<backoff::Error<InternalConnError>> for InternalConnError {
     fn from(v: backoff::Error<InternalConnError>) -> Self {
         match v {
             backoff::Error::Permanent(err) => err,
-            backoff::Error::Transient(err) => err,
+            backoff::Error::Transient { err, .. } => err,
         }
     }
 }
 
 fn retry_on_transient_pkcs11_error(err: Pkcs11Error) -> backoff::Error<InternalConnError> {
     if is_transient_error(&err) {
-        backoff::Error::Transient(err.into())
+        backoff::Error::transient(err.into())
     } else {
         backoff::Error::Permanent(err.into())
     }
 }
 
 fn retry_on_transient_signer_error(err: SignerError) -> backoff::Error<InternalConnError> {
     match err {
-        SignerError::TemporarilyUnavailable => backoff::Error::Transient(err.into()),
+        SignerError::TemporarilyUnavailable => backoff::Error::transient(err.into()),
         _ => backoff::Error::Permanent(err.into()),
     }
 }