summaryrefslogtreecommitdiffstats
path: root/g10/mainproc.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2009-05-18 19:38:34 +0200
committerWerner Koch <wk@gnupg.org>2009-05-18 19:38:34 +0200
commit387a51f9515fdfa26b5fa8bb22366844a315fd9c (patch)
tree026a801ad349e59e2e64c495a7478533cf627ecb /g10/mainproc.c
parentChanged default algo and size. (diff)
downloadgnupg2-387a51f9515fdfa26b5fa8bb22366844a315fd9c.tar.xz
gnupg2-387a51f9515fdfa26b5fa8bb22366844a315fd9c.zip
New gpgsm server option no-encrypt-to.
Add caching for symkey encryption. Minor cleanups.
Diffstat (limited to 'g10/mainproc.c')
-rw-r--r--g10/mainproc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 84a9de5f1..beab791b9 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -311,7 +311,7 @@ proc_symkey_enc( CTX c, PACKET *pkt )
}
else
{
- c->dek = passphrase_to_dek (NULL, 0, algo, &enc->s2k, 0,
+ c->dek = passphrase_to_dek (NULL, 0, algo, &enc->s2k, 3,
NULL, NULL);
if(c->dek)
{
@@ -548,7 +548,7 @@ proc_encrypted( CTX c, PACKET *pkt )
log_info (_("assuming %s encrypted data\n"), "IDEA");
}
- c->dek = passphrase_to_dek ( NULL, 0, algo, s2k, 0, NULL, NULL );
+ c->dek = passphrase_to_dek ( NULL, 0, algo, s2k, 3, NULL, NULL );
if (c->dek)
c->dek->algo_info_printed = 1;
}