diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-04-28 22:02:50 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-05-01 10:50:24 +0200 |
| commit | 1af227c2eaad386f0917fc4f36c84fd5999b884e (patch) | |
| tree | b497994bda9566413ed517eebba22eb3226f49e7 /methods | |
| parent | f13b413a3bb1f03886ba7d8c43b08bd13836a663 (diff) | |
gpgv: handle expired sig as worthless
Signatures on data can have an expiration date, too, which we hadn't
handled previously explicitly (no problem – gpg still has a non-zero
exit code so apt notices the invalid signature) so the error message
wasn't as helpful as it could be (aka mentioning the key signing it).
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/gpgv.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 2ab8b9c97..53c3ff80e 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -37,6 +37,7 @@ using std::vector; #define GNUPGVALIDSIG "[GNUPG:] VALIDSIG" #define GNUPGGOODSIG "[GNUPG:] GOODSIG" #define GNUPGEXPKEYSIG "[GNUPG:] EXPKEYSIG" +#define GNUPGEXPSIG "[GNUPG:] EXPSIG" #define GNUPGREVKEYSIG "[GNUPG:] REVKEYSIG" #define GNUPGNODATA "[GNUPG:] NODATA" @@ -188,6 +189,12 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, std::clog << "Got EXPKEYSIG! " << std::endl; WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } + else if (strncmp(buffer, GNUPGEXPSIG, sizeof(GNUPGEXPSIG)-1) == 0) + { + if (Debug == true) + std::clog << "Got EXPSIG!" << std::endl; + WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); + } else if (strncmp(buffer, GNUPGREVKEYSIG, sizeof(GNUPGREVKEYSIG)-1) == 0) { if (Debug == true) |