diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/getkey.c | 11 | ||||
| -rw-r--r-- | g13/keyblob.h | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 7aeaebc3f..028b04994 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -2602,7 +2602,7 @@ lookup (getkey_ctx_t ctx, kbnode_t *ret_keyblock, int want_secret) goto skip; /* No secret key available. */ /* Warning: node flag bits 0 and 1 should be preserved by - * merge_selfsigs. For secret keys, premerge did tranfer the + * merge_selfsigs. For secret keys, premerge transferred the * keys to the keyblock. */ merge_selfsigs (ctx->keyblock); if (finish_lookup (ctx)) @@ -2617,10 +2617,11 @@ lookup (getkey_ctx_t ctx, kbnode_t *ret_keyblock, int want_secret) /* Release resources and continue search. */ release_kbnode (ctx->keyblock); ctx->keyblock = NULL; - /* We need to disable the caching so that for an exact key search we - won't get the result back from the cache and thus end up in an - endless loop. Disabling this here is sufficient because although - the result may have been cached, if won't be used then. */ + /* We need to disable the caching so that for an exact key + search we won't get the result back from the cache and thus + end up in an endless loop. Disabling the cache here at this + point is sufficient because even a cached result won't be + used after a call to keydb_disable_caching. */ keydb_disable_caching (ctx->kr_handle); } diff --git a/g13/keyblob.h b/g13/keyblob.h index 99d239fee..5c3e74e12 100644 --- a/g13/keyblob.h +++ b/g13/keyblob.h @@ -115,12 +115,14 @@ /* A EncFS based backend. This requires a whole directory which includes the encrypted files. Metadata is not encrypted. */ +#define CONTTYPE_DM_CRYPT 2 +/* A DM-Crypt based backend. */ + #define CONTTYPE_TRUECRYPT 21571 /* A Truecrypt (www.truecrypt.org) based container. Due to the design of truecrypt this requires a second datafile because it is not - possible to to prepend a truecrypt container with our keyblob. */ - + possible to prepend a truecrypt container with our keyblob. */ |