]> git.saurik.com Git - apt.git/commitdiff
Revert "Handle ERRSIG in the gpgv method like BADSIG"
authorJulian Andres Klode <jak@debian.org>
Mon, 14 Mar 2016 13:44:33 +0000 (14:44 +0100)
committerJulian Andres Klode <jak@debian.org>
Mon, 14 Mar 2016 13:44:38 +0000 (14:44 +0100)
This reverts commit 76a71a1237d22c1990efbc19ce0e02aacf572576.

That commit broke the test suite.

Gbp-Dch: ignore

methods/gpgv.cc

index 5800a04f00dae07d6bf441e58b9c68c92057d39d..f17990245533f1f3b6ca9422ffa3fa6965b8ad47 100644 (file)
@@ -29,7 +29,6 @@ using std::vector;
 
 #define GNUPGPREFIX "[GNUPG:]"
 #define GNUPGBADSIG "[GNUPG:] BADSIG"
 
 #define GNUPGPREFIX "[GNUPG:]"
 #define GNUPGBADSIG "[GNUPG:] BADSIG"
-#define GNUPGERRSIG "[GNUPG:] ERRSIG"
 #define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY"
 #define GNUPGVALIDSIG "[GNUPG:] VALIDSIG"
 #define GNUPGGOODSIG "[GNUPG:] GOODSIG"
 #define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY"
 #define GNUPGVALIDSIG "[GNUPG:] VALIDSIG"
 #define GNUPGGOODSIG "[GNUPG:] GOODSIG"
@@ -102,12 +101,6 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
             std::clog << "Got BADSIG! " << std::endl;
          BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
       }
             std::clog << "Got BADSIG! " << std::endl;
          BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
       }
-      else if (strncmp(buffer, GNUPGERRSIG, sizeof(GNUPGERRSIG)-1) == 0)
-      {
-         if (Debug == true)
-            std::clog << "Got ERRSIG! " << std::endl;
-         BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
-      }
       else if (strncmp(buffer, GNUPGNOPUBKEY, sizeof(GNUPGNOPUBKEY)-1) == 0)
       {
          if (Debug == true)
       else if (strncmp(buffer, GNUPGNOPUBKEY, sizeof(GNUPGNOPUBKEY)-1) == 0)
       {
          if (Debug == true)