mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Aenderungen in der Eifel
This commit is contained in:
parent
45f1328259
commit
823d39fd55
13 changed files with 307 additions and 127 deletions
|
@ -54,9 +54,9 @@ do_check( PKT_secret_cert *cert )
|
|||
case CIPHER_ALGO_BLOWFISH:
|
||||
case CIPHER_ALGO_CAST:
|
||||
keyid_from_skc( cert, keyid );
|
||||
if( cert->protect.s2k == 1 || cert->protect.s2k == 3 )
|
||||
if( cert->protect.s2k.mode == 1 || cert->protect.s2k.mode == 4 )
|
||||
dek = get_passphrase_hash( keyid, NULL,
|
||||
cert->protect.salt );
|
||||
cert->protect.s2k.salt );
|
||||
else
|
||||
dek = get_passphrase_hash( keyid, NULL, NULL );
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue