aboutsummaryrefslogtreecommitdiffstats
path: root/common/asshelp.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2007-12-12 10:28:30 +0000
committerWerner Koch <[email protected]>2007-12-12 10:28:30 +0000
commitbae4b256c79c24e5306c692adf9bb5891433c7d5 (patch)
treec0aae4de008d75964074146240257f81b8ded0b1 /common/asshelp.c
parentAllow decryption using type 20 Elgamal keys. (diff)
downloadgnupg-bae4b256c79c24e5306c692adf9bb5891433c7d5.tar.gz
gnupg-bae4b256c79c24e5306c692adf9bb5891433c7d5.zip
Support DSA2.
Support Camellia for testing. More audit stuff.
Diffstat (limited to '')
-rw-r--r--common/asshelp.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/common/asshelp.c b/common/asshelp.c
index 5aa61c773..8274d88a7 100644
--- a/common/asshelp.c
+++ b/common/asshelp.c
@@ -172,6 +172,8 @@ send_pinentry_environment (assuan_context_t ctx,
{
err = send_one_option (ctx, errsource, "xauthority",
opt_xauthority ? opt_xauthority : dft_xauthority);
+ if (gpg_err_code (err) == GPG_ERR_UNKNOWN_OPTION)
+ err = 0;
if (err)
return err;
}
@@ -183,6 +185,8 @@ send_pinentry_environment (assuan_context_t ctx,
err = send_one_option (ctx, errsource, "pinentry-user-data",
opt_pinentry_user_data ?
opt_pinentry_user_data : dft_pinentry_user_data);
+ if (gpg_err_code (err) == GPG_ERR_UNKNOWN_OPTION)
+ err = 0;
if (err)
return err;
}