From 454d29fbb1f3f4447ffc1ad0cdd08c4c2e4e66f8 Mon Sep 17 00:00:00 2001
From: Martin Hoffmann <martin@nlnetlabs.nl>
Date: Wed, 18 Oct 2023 11:08:59 +0200
Subject: [PATCH] Upgrade to ring 0.17. (#233)

---
 Cargo.toml       | 4 ++--
 src/sign/ring.rs | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ee4b3115..e8325007 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ name = "domain"
 path = "src/lib.rs"
 
 [dependencies]
-octseq         = { git = "https://github.com/NLnetLabs/octseq.git" }
+octseq         = "0.3"
 time           = "0.3.1"
 
 rand           = { version = "0.8", optional = true }
@@ -26,7 +26,7 @@ chrono         = { version = "0.4.6", optional = true, default-features = false
 futures        = { version = "0.3", optional = true }
 heapless       = { version = "0.7", optional = true }
 #openssl       = { version = "0.10", optional = true }
-ring           = { version = "0.16.14", optional = true }
+ring           = { version = "0.17", optional = true }
 serde          = { version = "1.0.130", optional = true, features = ["derive"] }
 siphasher      = { version = "0.3.10", optional = true }
 smallvec       = { version = "1", optional = true }
diff --git a/src/sign/ring.rs b/src/sign/ring.rs
index 1100d947..5d14ee4a 100644
--- a/src/sign/ring.rs
+++ b/src/sign/ring.rs
@@ -44,6 +44,7 @@ impl<'a> Key<'a> {
         let keypair = EcdsaKeyPair::from_pkcs8(
             &ECDSA_P256_SHA256_FIXED_SIGNING,
             pkcs8.as_ref(),
+            rng,
         )?;
         let public_key = keypair.public_key().as_ref()[1..].into();
         Ok(Key {
@@ -94,7 +95,7 @@ impl<'a> SigningKey for Key<'a> {
             }
             RingKey::Ed25519(ref key) => Ok(Signature::sig(key.sign(msg))),
             RingKey::Rsa(ref key, encoding) => {
-                let mut sig = vec![0; key.public_modulus_len()];
+                let mut sig = vec![0; key.public().modulus_len()];
                 key.sign(encoding, self.rng, msg, &mut sig)?;
                 Ok(Signature::vec(sig))
             }