From dd0d0af049af6c0a566fe2d388cab932f7ac58c3 Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Sat, 2 Mar 2013 21:37:19 -0500
Subject: [PATCH] Require the key to decrypt before generating a new keypair.

---
 doc/pwmd.html  | 16 ++++++++--------
 src/commands.c | 25 +++++++++++++++++++++++++
 src/crypto.c   |  7 +++++++
 3 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/doc/pwmd.html b/doc/pwmd.html
index 8378a284..be301f5b 100644
--- a/doc/pwmd.html
+++ b/doc/pwmd.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
 <html>
-<!-- Created on February 27, 2013 by texi2html 1.82
+<!-- Created on March 2, 2013 by texi2html 1.82
 texi2html was written by: 
             Lionel Cons <Lionel.Cons@cern.ch> (original author)
             Karl Berry  <karl@freefriends.org>
@@ -1150,16 +1150,16 @@ via a data response rather than a status message.
 <h1 class="chapter">18. IMPORT command</h1>
 <a name="index-IMPORT-command"></a>
 <p>Syntax:
-</p><table><tr><td>&nbsp;</td><td><pre class="example">IMPORT &lt;content&gt;[&lt;TAB&gt;[!]element[&lt;TAB&gt;[!]child[..]]]
+</p><table><tr><td>&nbsp;</td><td><pre class="example">IMPORT [--root [!]element[&lt;TAB&gt;[!]child[..]]] &lt;content&gt;
 </pre></td></tr></table>
 
 <p>This command uses a server <em>INQUIRE</em> to retrieve data from the client.
 </p>
 <p>Like the <code>STORE</code> command (see section <a href="#STORE">STORE command</a>), but the <var>content</var> 
-argument is raw <abbr>XML</abbr> data. The content is created as a child of the 
-specified element path and will overwrite an existing element of the same 
-name. If an element of the element path does not exist then it will be 
-created.
+argument is raw <abbr>XML</abbr> data. The content is created as a child of 
+the element path specified with the &lsquo;<samp>--root</samp>&rsquo; option or at the 
+document root when not specified. Existing elements of the same name will 
+be overwritten.
 </p>
 <p>The content must begin with an <abbr>XML</abbr> element node. See section <a href="#Introduction">Overview of <code>pwmd</code></a>, 
 for details.
@@ -2195,7 +2195,7 @@ cache.
 </tr></table>
 <h1>About This Document</h1>
 <p>
-  This document was generated by <em>me</em> on <em>February 27, 2013</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.82</em></a>.
+  This document was generated by <em>me</em> on <em>March 2, 2013</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.82</em></a>.
 </p>
 <p>
   The buttons in the navigation panels have the following meaning:
@@ -2297,7 +2297,7 @@ cache.
 <hr size="1">
 <p>
  <font size="-1">
-  This document was generated by <em>me</em> on <em>February 27, 2013</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.82</em></a>.
+  This document was generated by <em>me</em> on <em>March 2, 2013</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.82</em></a>.
  </font>
  <br>
 
diff --git a/src/commands.c b/src/commands.c
index f0e6839e..0e65ec93 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -1002,6 +1002,31 @@ save_command (assuan_context_t ctx, char *line)
       rc = set_pinentry_mode (client->crypto->agent,
 			      (client->flags & FLAG_NO_PINENTRY) ? "loopback"
 			      : "ask");
+
+      if (!(client->flags & FLAG_NEW))
+	{
+	  struct crypto_s *crypto;
+	  char *key = NULL;
+	  size_t keylen = 0;
+
+	  /* Wanting to generate a new key. Require the key to open the
+	     current file before proceeding. */
+	  rc = cache_clear (client->md5file);
+	  if (!rc)
+	    {
+	      rc = init_client_crypto (&crypto);
+	      if (!rc)
+		crypto->client_ctx = client->ctx;
+	    }
+
+	  if (!rc)
+	    rc = decrypt_common (client->ctx, client->opts&OPT_INQUIRE, crypto,
+				 client->filename, &key, &keylen);
+
+	  xfree (key);
+	  cleanup_crypto (&crypto);
+	}
+
       if (!rc)
 	rc = send_status (client->ctx, STATUS_GENKEY, NULL);
 
diff --git a/src/crypto.c b/src/crypto.c
index 0d52fd87..2b14f5e0 100644
--- a/src/crypto.c
+++ b/src/crypto.c
@@ -1500,6 +1500,13 @@ decrypt_common (assuan_context_t ctx, int inquire, struct crypto_s *crypto,
 	  return rc;
 	}
     }
+  else if (!key && IS_PKI (crypto))
+    {
+      /* The cache entry has been cleared in save_command(). Will prompt. */
+      rc = set_pinentry_mode (crypto->agent, inquire ? "loopback" : "ask");
+      if (rc)
+	return rc;
+    }
 #endif
 
   if (key && !IS_PKI (crypto))
-- 
2.11.4.GIT

