diff options
| author | Sam Varshavchik | 2016-11-27 16:23:46 -0500 |
|---|---|---|
| committer | Sam Varshavchik | 2016-11-27 16:24:43 -0500 |
| commit | 2d4cfb175a183453c9339b8affb0b8c226abc98f (patch) | |
| tree | 302330e7a71999ac829acbeb71a7b18d152d0a4e /sqwebmail/gpg.c | |
| parent | e21842e21535133d86f4c304e445e6d69f029ab5 (diff) | |
| download | courier-libs-2d4cfb175a183453c9339b8affb0b8c226abc98f.tar.bz2 | |
sqwebmail: improve compatibility with gnupg 2 (gpglib update).
Diffstat (limited to 'sqwebmail/gpg.c')
| -rw-r--r-- | sqwebmail/gpg.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sqwebmail/gpg.c b/sqwebmail/gpg.c index 57f4ed4..80cb3f2 100644 --- a/sqwebmail/gpg.c +++ b/sqwebmail/gpg.c @@ -425,17 +425,11 @@ static FILE *passphrasefp() return (fp); } -static void signkey(const char *signthis, const char *signwith, - const char *trustlevel) +static void signkey(const char *signthis, const char *signwith) { int rc; FILE *fp=NULL; - int n=atoi(trustlevel); - - if (n < 0 || n > 9) - n=0; - if (gpgbadarg(signthis) || gpgbadarg(signwith)) return; @@ -445,7 +439,7 @@ static void signkey(const char *signthis, const char *signwith, fp=passphrasefp(); rc=libmail_gpg_signkey(GPGDIR, signthis, signwith, - fp ? fileno(fp):-1, gpg_error, n, NULL); + fp ? fileno(fp):-1, gpg_error, NULL); if (fp) fclose(fp); @@ -473,8 +467,7 @@ void gpgdo() else if (*cgi("delsec") && *cgi("really")) delkey(cgi("seckeyname"), 1); else if (*cgi("sign")) - signkey(cgi("pubkeyname"), cgi("seckeyname"), - cgi("signlevel")); + signkey(cgi("pubkeyname"), cgi("seckeyname")); else if (*cgi("setdefault")) setdefault(cgi("seckeyname")); } @@ -743,4 +736,3 @@ int gpgexportkey(const char *fingerprint, int issecret, gpg_error, arg)); } - |