diff options
| author | Werner Koch <[email protected]> | 2004-02-03 16:24:37 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2004-02-03 16:24:37 +0000 |
| commit | 31de2267ec849cd8f269cd8bf25b8590f2d93e1d (patch) | |
| tree | 3214ee9345c70ecc1d8c7ca74fad22b5d574ac5c /agent/findkey.c | |
| parent | * keybox.h (keybox_flag_t): New. (diff) | |
| download | gnupg-31de2267ec849cd8f269cd8bf25b8590f2d93e1d.tar.gz gnupg-31de2267ec849cd8f269cd8bf25b8590f2d93e1d.zip | |
* findkey.c (agent_key_from_file): Extra paranoid wipe.
* protect.c (agent_unprotect): Ditto.
(merge_lists): Ditto. Add arg RESULTLEN.
* pkdecrypt.c (agent_pkdecrypt): Don't show the secret key even in
debug mode.
* protect.c: Add DSA and Elgamal description.
Diffstat (limited to 'agent/findkey.c')
| -rw-r--r-- | agent/findkey.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/agent/findkey.c b/agent/findkey.c index a9566a2c7..f145daef1 100644 --- a/agent/findkey.c +++ b/agent/findkey.c @@ -154,7 +154,7 @@ unprotect (CTRL ctrl, sprintf (hexgrip+2*i, "%02X", grip[i]); hexgrip[40] = 0; - /* first try to get it from the cache - if there is none or we can't + /* First try to get it from the cache - if there is none or we can't unprotect it, we fall back to ask the user */ if (!ignore_cache) { @@ -329,9 +329,9 @@ agent_key_from_file (CTRL ctrl, return rc; } - /* Arggg FIXME: does scan support secure memory? */ - rc = gcry_sexp_sscan (&s_skey, &erroff, - buf, gcry_sexp_canon_len (buf, 0, NULL, NULL)); + buflen = gcry_sexp_canon_len (buf, 0, NULL, NULL); + rc = gcry_sexp_sscan (&s_skey, &erroff, buf, buflen); + wipememory (buf, buflen); xfree (buf); if (rc) { |