diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-04-28 19:05:06 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-05-01 10:50:24 +0200 |
| commit | f13b413a3bb1f03886ba7d8c43b08bd13836a663 (patch) | |
| tree | 4203c82dd7a56bb66c9b27457d5dca687da8ed48 | |
| parent | d622baeea4828b4bf62d939b7a4a7cd4051f78a5 (diff) | |
gpgv: use EXPKEYSIG instead of KEYEXPIRED
The upstream documentation says about KEYEXPIRED:
"This status line is not very useful". Indeed, it doesn't mention which
key is expired, and suggests to use the other message which does.
| -rw-r--r-- | methods/gpgv.cc | 6 | ||||
| -rwxr-xr-x | test/integration/test-releasefile-verification | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 60a7d4719..2ab8b9c97 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -36,7 +36,7 @@ using std::vector; #define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY" #define GNUPGVALIDSIG "[GNUPG:] VALIDSIG" #define GNUPGGOODSIG "[GNUPG:] GOODSIG" -#define GNUPGKEYEXPIRED "[GNUPG:] KEYEXPIRED" +#define GNUPGEXPKEYSIG "[GNUPG:] EXPKEYSIG" #define GNUPGREVKEYSIG "[GNUPG:] REVKEYSIG" #define GNUPGNODATA "[GNUPG:] NODATA" @@ -182,10 +182,10 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, std::clog << "Got NODATA! " << std::endl; BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } - else if (strncmp(buffer, GNUPGKEYEXPIRED, sizeof(GNUPGKEYEXPIRED)-1) == 0) + else if (strncmp(buffer, GNUPGEXPKEYSIG, sizeof(GNUPGEXPKEYSIG)-1) == 0) { if (Debug == true) - std::clog << "Got KEYEXPIRED! " << std::endl; + std::clog << "Got EXPKEYSIG! " << std::endl; WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } else if (strncmp(buffer, GNUPGREVKEYSIG, sizeof(GNUPGREVKEYSIG)-1) == 0) diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification index c349c4428..10b830449 100755 --- a/test/integration/test-releasefile-verification +++ b/test/integration/test-releasefile-verification @@ -123,7 +123,7 @@ runtest() { cp keys/rexexpired.pub rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg signreleasefiles 'Rex Expired' find aptarchive/ -name "$DELETEFILE" -delete - updatewithwarnings '^W: .* KEYEXPIRED' + updatewithwarnings '^W: .* EXPKEYSIG' testsuccessequal "$(cat "${PKGFILE}") " aptcache show apt failaptold @@ -172,7 +172,7 @@ runtest() { cp keys/rexexpired.pub rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg signreleasefiles 'Rex Expired' find aptarchive/ -name "$DELETEFILE" -delete - updatewithwarnings '^W: .* KEYEXPIRED' + updatewithwarnings '^W: .* EXPKEYSIG' testsuccessequal "$(cat "${PKGFILE}") " aptcache show apt installaptold |