summaryrefslogtreecommitdiffstats
path: root/agent/cvt-openpgp.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2020-08-17 14:21:00 +0200
committerWerner Koch <wk@gnupg.org>2020-08-17 15:05:49 +0200
commit0da923a1240ac78d60c92cdd8488c4e405c3243b (patch)
tree106ce6faa60a206478752cb21096cc29b4e90d15 /agent/cvt-openpgp.c
parentAdd --chuid to gpg, gpg-card, and gpg-connect-agent. (diff)
downloadgnupg2-0da923a1240ac78d60c92cdd8488c4e405c3243b.tar.xz
gnupg2-0da923a1240ac78d60c92cdd8488c4e405c3243b.zip
agent: Allow to pass a timestamp to genkey and import.
* agent/command.c (cmd_genkey): Add option --timestamp. (cmd_import_key): Ditto. * agent/genkey.c (store_key): Add arg timestamp and change callers. (agent_genkey): Ditto. * agent/findkey.c (write_extended_private_key): Add args timestamp and new key to write a Created line. (agent_write_private_key): Add arg timestamp. (agent_write_shadow_key): Ditto. agent/protect-tool.c (agent_write_private_key): Ditto as dummy arg. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'agent/cvt-openpgp.c')
-rw-r--r--agent/cvt-openpgp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/agent/cvt-openpgp.c b/agent/cvt-openpgp.c
index 5d60b66f3..c43809f90 100644
--- a/agent/cvt-openpgp.c
+++ b/agent/cvt-openpgp.c
@@ -1114,7 +1114,7 @@ convert_from_openpgp_native (ctrl_t ctrl,
&protectedkey, &protectedkeylen,
ctrl->s2k_count, -1))
agent_write_private_key (grip, protectedkey, protectedkeylen, 1,
- NULL, NULL);
+ NULL, NULL, 0);
xfree (protectedkey);
}
else
@@ -1123,7 +1123,7 @@ convert_from_openpgp_native (ctrl_t ctrl,
agent_write_private_key (grip,
*r_key,
gcry_sexp_canon_len (*r_key, 0, NULL,NULL),
- 1, NULL, NULL);
+ 1, NULL, NULL, 0);
}
}