diff options
| author | Werner Koch <[email protected]> | 2009-05-18 17:38:34 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2009-05-18 17:38:34 +0000 |
| commit | 387a51f9515fdfa26b5fa8bb22366844a315fd9c (patch) | |
| tree | 026a801ad349e59e2e64c495a7478533cf627ecb /g10/encode.c | |
| parent | Changed default algo and size. (diff) | |
| download | gnupg-387a51f9515fdfa26b5fa8bb22366844a315fd9c.tar.gz gnupg-387a51f9515fdfa26b5fa8bb22366844a315fd9c.zip | |
New gpgsm server option no-encrypt-to.
Add caching for symkey encryption.
Minor cleanups.
Diffstat (limited to 'g10/encode.c')
| -rw-r--r-- | g10/encode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/encode.c b/g10/encode.c index 10c638f89..0c7dc4e22 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -216,7 +216,7 @@ encode_simple( const char *filename, int mode, int use_seskey ) s2k->mode = RFC1991? 0:opt.s2k_mode; s2k->hash_algo=S2K_DIGEST_ALGO; cfx.dek = passphrase_to_dek( NULL, 0, - default_cipher_algo(), s2k, 2, + default_cipher_algo(), s2k, 4, NULL, &canceled); if( !cfx.dek || !cfx.dek->keylen ) { rc = gpg_error (canceled? GPG_ERR_CANCELED:GPG_ERR_INV_PASSPHRASE); @@ -397,7 +397,7 @@ setup_symkey(STRING2KEY **symkey_s2k,DEK **symkey_dek) (*symkey_s2k)->hash_algo = S2K_DIGEST_ALGO; *symkey_dek=passphrase_to_dek(NULL,0,opt.s2k_cipher_algo, - *symkey_s2k,2,NULL, &canceled); + *symkey_s2k, 4, NULL, &canceled); if(!*symkey_dek || !(*symkey_dek)->keylen) { xfree(*symkey_dek); |