diff options
Diffstat (limited to 'agent/findkey.c')
| -rw-r--r-- | agent/findkey.c | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/agent/findkey.c b/agent/findkey.c index bdb6ab4f5..fa09d645a 100644 --- a/agent/findkey.c +++ b/agent/findkey.c @@ -54,8 +54,8 @@ struct try_unprotect_arg_s /* Note: Ownership of FNAME and FP are moved to this function. */ static gpg_error_t -write_extended_private_key (char *fname, estream_t fp, int update, - const void *buf, size_t len) +write_extended_private_key (char *fname, estream_t fp, int update, int newkey, + const void *buf, size_t len, time_t timestamp) { gpg_error_t err; nvc_t pk = NULL; @@ -93,6 +93,19 @@ write_extended_private_key (char *fname, estream_t fp, int update, if (err) goto leave; + /* If a timestamp has been supplied and the key is new write a + * creation timestamp. (We double check that there is no Created + * item yet.)*/ + if (timestamp && newkey && !nvc_lookup (pk, "Created:")) + { + gnupg_isotime_t timebuf; + + epoch2isotime (timebuf, timestamp); + err = nvc_add (pk, "Created:", timebuf); + if (err) + goto leave; + } + err = es_fseek (fp, 0, SEEK_SET); if (err) goto leave; @@ -136,11 +149,13 @@ write_extended_private_key (char *fname, estream_t fp, int update, } /* Write an S-expression formatted key to our key storage. With FORCE - passed as true an existing key with the given GRIP will get - overwritten. */ + * passed as true an existing key with the given GRIP will get + * overwritten. If TIMESTAMP is not zero and the key does not yet + * exists it will be recorded as creation date. */ int agent_write_private_key (const unsigned char *grip, - const void *buffer, size_t length, int force) + const void *buffer, size_t length, + int force, time_t timestamp) { char *fname; estream_t fp; @@ -208,17 +223,20 @@ agent_write_private_key (const unsigned char *grip, if (first != '(') { /* Key is already in the extended format. */ - return write_extended_private_key (fname, fp, 1, buffer, length); + return write_extended_private_key (fname, fp, 1, 0, buffer, length, + timestamp); } if (first == '(' && opt.enable_extended_key_format) { /* Key is in the old format - but we want the extended format. */ - return write_extended_private_key (fname, fp, 0, buffer, length); + return write_extended_private_key (fname, fp, 0, 0, buffer, length, + timestamp); } } if (opt.enable_extended_key_format) - return write_extended_private_key (fname, fp, 0, buffer, length); + return write_extended_private_key (fname, fp, 0, 1, buffer, length, + timestamp); if (es_fwrite (buffer, length, 1, fp) != 1) { @@ -1596,7 +1614,7 @@ agent_write_shadow_key (const unsigned char *grip, } len = gcry_sexp_canon_len (shdkey, 0, NULL, NULL); - err = agent_write_private_key (grip, shdkey, len, force); + err = agent_write_private_key (grip, shdkey, len, force, 0); xfree (shdkey); if (err) log_error ("error writing key: %s\n", gpg_strerror (err)); |