sshkeys: Make MgktKeyReport contain Nonce via KeySpec

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/sshkeys.rs b/src/sshkeys.rs
index f432d7fd826290f4b2ce88a1665d37a6f113f10b..d9a791033dfaa8b90afb33197a8077097c90e7c7 100644 (file)
--- a/src/sshkeys.rs
+++ b/src/sshkeys.rs
@@ -178,7 +178,7 @@ impl PerScope {
 
 #[derive(Debug,Clone,Serialize,Deserialize)]
 pub struct MgmtKeyReport {
-  id: Id,
+  key: KeySpec,
   data: PubData,
   comment: Comment,
   problem: Option<KeyError>,
@@ -225,7 +225,10 @@ impl AccountsGuard {
       let problem = if let Some(Err(ref e)) = key.fp { Some(e) }
                     else { dirty_error.as_ref() };
       MgmtKeyReport {
+        key: KeySpec {
         id:      sk.id,
+        nonce:   key.nonce.clone(),
+        },
         data:    key.data.clone(),
         comment: sk.comment.clone(),
         problem: problem.cloned(),