security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

doc: Minor comment fixes. 

--
This commit is contained in:
Werner Koch 2015-09-09 15:14:20 +02:00
parent f10b427d0e
commit 56bf1061f8
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
g10/getkey.c
View File

@ -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);
}

6
g13/keyblob.h
View File

@ -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. */