diff options
| -rw-r--r-- | sqwebmail/ChangeLog | 4 | ||||
| -rw-r--r-- | sqwebmail/gpg.c | 14 | ||||
| -rw-r--r-- | sqwebmail/html/en-us/gpg.html | 26 |
3 files changed, 12 insertions, 32 deletions
diff --git a/sqwebmail/ChangeLog b/sqwebmail/ChangeLog index 3450934..91dd453 100644 --- a/sqwebmail/ChangeLog +++ b/sqwebmail/ChangeLog @@ -1,3 +1,7 @@ +2016-11-27 Sam Varshavchik <mrsam@courier-mta.com> + + * Improve compatilibity with gnupg 2. + 2016-09-20 "Hanno Böck" <hanno@hboeck.de> * gpg.c: Fix external linkage. 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)); } - diff --git a/sqwebmail/html/en-us/gpg.html b/sqwebmail/html/en-us/gpg.html index 0fdbc42..b018e38 100644 --- a/sqwebmail/html/en-us/gpg.html +++ b/sqwebmail/html/en-us/gpg.html @@ -83,7 +83,7 @@ <br /> [#LISTPUB#] - <p> + <p> <input type="submit" value="Delete Public Key" name="delpub" /></p> <hr width="90%" /> @@ -92,7 +92,7 @@ <br /> [#LISTSEC#] - <p> + <p> <input type="submit" value="Delete Private Key" name="delsec" /><input type="checkbox" name="really" />Yes, I really want to do this</p> @@ -105,31 +105,15 @@ size="20" name="passphrase" /></p> <!-- [#?#] --> - <p> Choose a public and a private key, above, then + <p> Choose a public and a private key, above, then <input type="submit" value="sign" name="sign" /></p> - <table width="90%" border="0" align="center"> - <tbody> - <tr> - <td>How carefully have you verified the key you are about to - sign actually belongs to the person named above? - <select name="signlevel"> - <option value="0">I don't know (default) </option> - <option value="1">I haven't checked </option> - <option value="2">I have done casual checking </option> - <option value="3">I have done very careful - checking</option> - </select> - </td> - </tr> - </tbody> - </table> <hr size="1" noshade="noshade" width="100%" /> <p align="center" class="gpgdefaulttitle">Default Private Key</p> <p> Select a default private key for signing, above, - then + then <input type="submit" value="set it as the default" name="setdefault" /></p> </form> @@ -181,7 +165,7 @@ </tr> <tr> <td align="right">Expiration:</td> - <td><input type="text" size="4" name="newexpire" /> + <td><input type="text" size="4" name="newexpire" /> <select name="newexpirewhen"> <option value="" selected="selected">-- no expiration-- </option> |