diff options
| author | Werner Koch <[email protected]> | 2009-08-20 08:41:15 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2009-08-20 08:41:15 +0000 |
| commit | 7cde92403c2134a20818a9c499b60450a3addfcb (patch) | |
| tree | f7e9acb88cd05bfd6e142bfde026f0405876e290 /include | |
| parent | Fixed bug#920 (diff) | |
| download | gnupg-7cde92403c2134a20818a9c499b60450a3addfcb.tar.gz gnupg-7cde92403c2134a20818a9c499b60450a3addfcb.zip | |
2009-08-20 Daiki Ueno <[email protected]>
* mainproc.c (proc_encrypted): Clear passphrase cached with S2K
cache ID if decryption failed.
* passphrase.c (passphrase_to_dek_ext): Set dek->s2k_cacheid.
* gpgv.c (passphrase_clear_cache): New stub.
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 4 | ||||
| -rw-r--r-- | include/cipher.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 559d305ba..339800f37 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2009-08-20 Daiki Ueno <[email protected]> (wk) + + * cipher.h (struct DEK): Add field S2K_CACHEID. + 2008-04-18 Werner Koch <[email protected]> * cipher.h (CIPHER_ALGO_CAMELLIA256): Change ID to 13. diff --git a/include/cipher.h b/include/cipher.h index 0d75fa6cd..8e198283d 100644 --- a/include/cipher.h +++ b/include/cipher.h @@ -94,6 +94,7 @@ typedef struct int use_mdc; int symmetric; byte key[32]; /* This is the largest used keylen (256 bit). */ + char s2k_cacheid[1+16+1]; } DEK; |