Merge pull request #7 from decathorpe/main

Port to rsa 0.5 and rand 0.8

Cargo.toml

@@ -18,10 +18,11 @@ dbus-crossroads = "0.2.1"
 parsec-client = "0.11.0"
 ring = { version = "0.16.15", features = ["std"] }
 anyhow = "1.0.32"
-rsa = "0.3.0"
+rsa = "0.5.0"
+pkcs1 = "0.2.4"
 sha2 = "0.9.1"
 hex = "0.4.0"
-rand = "0.7.3"
+rand = "0.8"
 
 [build-dependencies]
 dbus-codegen = "0.5.0"

src/utility.rs

@@ -3,7 +3,8 @@ static DBUS_NAME: &str = "com.github.puiterwijk.dbus_parsec";
 
 use anyhow::{ensure, Context, Result};
 
-use rsa::{PaddingScheme, PublicKey, RSAPublicKey};
+use pkcs1::FromRsaPublicKey;
+use rsa::{PaddingScheme, PublicKey, RsaPublicKey};
 
 use rand::rngs::OsRng;
 
@@ -75,7 +76,7 @@ fn main() -> Result<()> {
             )
         })?;
     println!("Public key sha256: {}", sha256_hex(&pubkey));
-    let pubkey = RSAPublicKey::from_pkcs1(&pubkey)
+    let pubkey = RsaPublicKey::from_pkcs1_der(&pubkey)
         .with_context(|| "Unable to parse retrieved public key")?;
 
     // Generate a wrapper key