add apt-key support for armored GPG key files (*.asc)

[apt.git] / methods / gpgv.cc

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index b6e0fa7bda40d1901becd00f114c83c0553b1b69..a8887d70355973a9b81f04478f8b6550c1b93a2c 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,6 +1,5 @@
 #include <config.h>
 
 #include <config.h>
 

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/gpgv.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/gpgv.h>


@@ -32,12 +31,16 @@ 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"

-#define GNUPGKEYEXPIRED "[GNUPG:] KEYEXPIRED"
+#define GNUPGEXPKEYSIG "[GNUPG:] EXPKEYSIG"
+#define GNUPGEXPSIG "[GNUPG:] EXPSIG"

 #define GNUPGREVKEYSIG "[GNUPG:] REVKEYSIG"
 #define GNUPGNODATA "[GNUPG:] NODATA"
 #define GNUPGREVKEYSIG "[GNUPG:] REVKEYSIG"
 #define GNUPGNODATA "[GNUPG:] NODATA"

+#define APTKEYWARNING "[APTKEY:] WARNING"
+#define APTKEYERROR "[APTKEY:] ERROR"

 
 struct Digest {
    enum class State {
 
 struct Digest {
    enum class State {


@@ -46,6 +49,19 @@ struct Digest {
       Trusted,
    } state;
    char name[32];
       Trusted,
    } state;
    char name[32];

+
+   State getState() const {
+      std::string optionUntrusted;
+      std::string optionWeak;
+      strprintf(optionUntrusted, "APT::Hashes::%s::Untrusted", name);
+      strprintf(optionWeak, "APT::Hashes::%s::Weak", name);
+      if (_config->FindB(optionUntrusted, state == State::Untrusted) == true)
+        return State::Untrusted;
+      if (_config->FindB(optionWeak, state == State::Weak) == true)
+        return State::Weak;
+
+      return state;
+   }

 };
 
 static constexpr Digest Digests[] = {
 };
 
 static constexpr Digest Digests[] = {


@@ -77,6 +93,10 @@ struct Signer {
    std::string key;
    std::string note;
 };
    std::string key;
    std::string note;
 };

+static bool IsTheSameKey(std::string const &validsig, std::string const &goodsig) {
+   // VALIDSIG reports a keyid (40 = 24 + 16), GOODSIG is a longid (16) only
+   return validsig.compare(24, 16, goodsig, strlen("GOODSIG "), 16) == 0;
+}

 
 class GPGVMethod : public aptMethod
 {
 
 class GPGVMethod : public aptMethod
 {


@@ -91,10 +111,36 @@ class GPGVMethod : public aptMethod
    protected:
    virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE;
    public:
    protected:
    virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE;
    public:

-   

    GPGVMethod() : aptMethod("gpgv","1.0",SingleInstance | SendConfig) {};
 };
    GPGVMethod() : aptMethod("gpgv","1.0",SingleInstance | SendConfig) {};
 };

-
+static void PushEntryWithKeyID(std::vector<std::string> &Signers, char * const buffer, bool const Debug)
+{
+   char * const msg = buffer + sizeof(GNUPGPREFIX);
+   char *p = msg;
+   // skip the message
+   while (*p && !isspace(*p))
+      ++p;
+   // skip the seperator whitespace
+   ++p;
+   // skip the hexdigit fingerprint
+   while (*p && isxdigit(*p))
+      ++p;
+   // cut the rest from the message
+   *p = '\0';
+   if (Debug == true)
+      std::clog << "Got " << msg << " !" << std::endl;
+   Signers.push_back(msg);
+}
+static void PushEntryWithUID(std::vector<std::string> &Signers, char * const buffer, bool const Debug)
+{
+   std::string msg = buffer + sizeof(GNUPGPREFIX);
+   auto const nuke = msg.find_last_not_of("\n\t\r");
+   if (nuke != std::string::npos)
+      msg.erase(nuke + 1);
+   if (Debug == true)
+      std::clog << "Got " << msg << " !" << std::endl;
+   Signers.push_back(msg);
+}

 string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
                                         std::string const &key,
                                         vector<string> &GoodSigners,
 string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
                                         std::string const &key,
                                         vector<string> &GoodSigners,


@@ -103,7 +149,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
                                         vector<Signer> &SoonWorthlessSigners,
                                         vector<string> &NoPubKeySigners)
 {
                                         vector<Signer> &SoonWorthlessSigners,
                                         vector<string> &NoPubKeySigners)
 {

-   bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);
+   bool const Debug = DebugEnabled();

 
    if (Debug == true)
       std::clog << "inside VerifyGetSigners" << std::endl;
 
    if (Debug == true)
       std::clog << "inside VerifyGetSigners" << std::endl;


@@ -125,8 +171,10 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
 
    // Loop over the output of apt-key (which really is gnupg), and check the signatures.
    std::vector<std::string> ValidSigners;
 
    // Loop over the output of apt-key (which really is gnupg), and check the signatures.
    std::vector<std::string> ValidSigners;

+   std::vector<std::string> ErrSigners;

    size_t buffersize = 0;
    char *buffer = NULL;
    size_t buffersize = 0;
    char *buffer = NULL;

+   bool gotNODATA = false;

    while (1)
    {
       if (getline(&buffer, &buffersize, pipein) == -1)
    while (1)
    {
       if (getline(&buffer, &buffersize, pipein) == -1)


@@ -139,85 +187,67 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       // if we improve the apt method communication stuff later
       // it will be better.
       if (strncmp(buffer, GNUPGBADSIG, sizeof(GNUPGBADSIG)-1) == 0)
       // if we improve the apt method communication stuff later
       // it will be better.
       if (strncmp(buffer, GNUPGBADSIG, sizeof(GNUPGBADSIG)-1) == 0)

-      {
-         if (Debug == true)
-            std::clog << "Got BADSIG! " << std::endl;
-         BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
-      }
+        PushEntryWithUID(BadSigners, buffer, Debug);
+      else if (strncmp(buffer, GNUPGERRSIG, sizeof(GNUPGERRSIG)-1) == 0)
+        PushEntryWithKeyID(ErrSigners, buffer, Debug);

       else if (strncmp(buffer, GNUPGNOPUBKEY, sizeof(GNUPGNOPUBKEY)-1) == 0)
       {
       else if (strncmp(buffer, GNUPGNOPUBKEY, sizeof(GNUPGNOPUBKEY)-1) == 0)
       {

-         if (Debug == true)
-            std::clog << "Got NO_PUBKEY " << std::endl;
-         NoPubKeySigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
-      }
-      else if (strncmp(buffer, GNUPGNODATA, sizeof(GNUPGBADSIG)-1) == 0)
-      {
-         if (Debug == true)
-            std::clog << "Got NODATA! " << std::endl;
-         BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
-      }
-      else if (strncmp(buffer, GNUPGKEYEXPIRED, sizeof(GNUPGKEYEXPIRED)-1) == 0)
-      {
-         if (Debug == true)
-            std::clog << "Got KEYEXPIRED! " << std::endl;
-         WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
+        PushEntryWithKeyID(NoPubKeySigners, buffer, Debug);
+        ErrSigners.erase(std::remove_if(ErrSigners.begin(), ErrSigners.end(), [&](std::string const &errsig) {
+                 return errsig.compare(strlen("ERRSIG "), 16, buffer, sizeof(GNUPGNOPUBKEY), 16) == 0;  }), ErrSigners.end());

       }
       }

+      else if (strncmp(buffer, GNUPGNODATA, sizeof(GNUPGNODATA)-1) == 0)
+        gotNODATA = true;
+      else if (strncmp(buffer, GNUPGEXPKEYSIG, sizeof(GNUPGEXPKEYSIG)-1) == 0)
+        PushEntryWithUID(WorthlessSigners, buffer, Debug);
+      else if (strncmp(buffer, GNUPGEXPSIG, sizeof(GNUPGEXPSIG)-1) == 0)
+        PushEntryWithUID(WorthlessSigners, buffer, Debug);

       else if (strncmp(buffer, GNUPGREVKEYSIG, sizeof(GNUPGREVKEYSIG)-1) == 0)
       else if (strncmp(buffer, GNUPGREVKEYSIG, sizeof(GNUPGREVKEYSIG)-1) == 0)

-      {
-         if (Debug == true)
-            std::clog << "Got REVKEYSIG! " << std::endl;
-         WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
-      }
+        PushEntryWithUID(WorthlessSigners, buffer, Debug);

       else if (strncmp(buffer, GNUPGGOODSIG, sizeof(GNUPGGOODSIG)-1) == 0)
       else if (strncmp(buffer, GNUPGGOODSIG, sizeof(GNUPGGOODSIG)-1) == 0)

-      {
-         char *sig = buffer + sizeof(GNUPGPREFIX);
-         char *p = sig + sizeof("GOODSIG");
-         while (*p && isxdigit(*p)) 
-            p++;
-         *p = 0;
-         if (Debug == true)
-            std::clog << "Got GOODSIG, key ID:" << sig << std::endl;
-         GoodSigners.push_back(string(sig));
-      }
+        PushEntryWithKeyID(GoodSigners, buffer, Debug);

       else if (strncmp(buffer, GNUPGVALIDSIG, sizeof(GNUPGVALIDSIG)-1) == 0)
       {
       else if (strncmp(buffer, GNUPGVALIDSIG, sizeof(GNUPGVALIDSIG)-1) == 0)
       {

-         char *sig = buffer + sizeof(GNUPGVALIDSIG);
-         std::istringstream iss((string(sig)));
+         std::istringstream iss(buffer + sizeof(GNUPGVALIDSIG));

          vector<string> tokens{std::istream_iterator<string>{iss},
                                std::istream_iterator<string>{}};
          vector<string> tokens{std::istream_iterator<string>{iss},
                                std::istream_iterator<string>{}};

-         char *p = sig;
-         while (*p && isxdigit(*p))
-            p++;
-         *p = 0;
+         auto const sig = tokens[0];

          // Reject weak digest algorithms
          Digest digest = FindDigest(tokens[7]);
          // Reject weak digest algorithms
          Digest digest = FindDigest(tokens[7]);

-         switch (digest.state) {
+         switch (digest.getState()) {

          case Digest::State::Weak:
             // Treat them like an expired key: For that a message about expiry
             // is emitted, a VALIDSIG, but no GOODSIG.
          case Digest::State::Weak:
             // Treat them like an expired key: For that a message about expiry
             // is emitted, a VALIDSIG, but no GOODSIG.

-            SoonWorthlessSigners.push_back({string(sig), digest.name});
+            SoonWorthlessSigners.push_back({sig, digest.name});

            if (Debug == true)
               std::clog << "Got weak VALIDSIG, key ID: " << sig << std::endl;
             break;
          case Digest::State::Untrusted:
             // Treat them like an expired key: For that a message about expiry
             // is emitted, a VALIDSIG, but no GOODSIG.
            if (Debug == true)
               std::clog << "Got weak VALIDSIG, key ID: " << sig << std::endl;
             break;
          case Digest::State::Untrusted:
             // Treat them like an expired key: For that a message about expiry
             // is emitted, a VALIDSIG, but no GOODSIG.

-            WorthlessSigners.push_back(string(sig));
-            GoodSigners.erase(std::remove(GoodSigners.begin(), GoodSigners.end(), string(sig)));
+            WorthlessSigners.push_back(sig);
+            GoodSigners.erase(std::remove_if(GoodSigners.begin(), GoodSigners.end(), [&](std::string const &goodsig) {
+                    return IsTheSameKey(sig, goodsig); }), GoodSigners.end());

            if (Debug == true)
               std::clog << "Got untrusted VALIDSIG, key ID: " << sig << std::endl;
             break;
            if (Debug == true)
               std::clog << "Got untrusted VALIDSIG, key ID: " << sig << std::endl;
             break;

-         case Digest::State::Trusted:
+
+        case Digest::State::Trusted:

            if (Debug == true)
               std::clog << "Got trusted VALIDSIG, key ID: " << sig << std::endl;
             break;
          }
 
            if (Debug == true)
               std::clog << "Got trusted VALIDSIG, key ID: " << sig << std::endl;
             break;
          }
 

-         ValidSigners.push_back(string(sig));
+         ValidSigners.push_back(sig);

       }
       }

+      else if (strncmp(buffer, APTKEYWARNING, sizeof(APTKEYWARNING)-1) == 0)
+         Warning("%s", buffer + sizeof(APTKEYWARNING));
+      else if (strncmp(buffer, APTKEYERROR, sizeof(APTKEYERROR)-1) == 0)
+        _error->Error("%s", buffer + sizeof(APTKEYERROR));

    }
    fclose(pipein);
    free(buffer);
    }
    fclose(pipein);
    free(buffer);

+   std::move(ErrSigners.begin(), ErrSigners.end(), std::back_inserter(WorthlessSigners));

 
    // apt-key has a --keyid parameter, but this requires gpg, so we call it without it
    // and instead check after the fact which keyids where used for verification
 
    // apt-key has a --keyid parameter, but this requires gpg, so we call it without it
    // and instead check after the fact which keyids where used for verification


@@ -225,25 +255,45 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
    {
       if (Debug == true)
         std::clog << "GoodSigs needs to be limited to keyid " << key << std::endl;
    {
       if (Debug == true)
         std::clog << "GoodSigs needs to be limited to keyid " << key << std::endl;

-      std::vector<std::string>::iterator const foundItr = std::find(ValidSigners.begin(), ValidSigners.end(), key);
-      bool const found = (foundItr != ValidSigners.end());
-      std::copy(GoodSigners.begin(), GoodSigners.end(), std::back_insert_iterator<std::vector<std::string> >(NoPubKeySigners));
-      if (found)
+      bool foundGood = false;
+      for (auto const &k: VectorizeString(key, ','))

       {
       {

+        if (std::find(ValidSigners.begin(), ValidSigners.end(), k) == ValidSigners.end())
+           continue;

         // we look for GOODSIG here as well as an expired sig is a valid sig as well (but not a good one)
         // we look for GOODSIG here as well as an expired sig is a valid sig as well (but not a good one)

-        std::string const goodlongkeyid = "GOODSIG " + key.substr(24, 16);
-        bool const foundGood = std::find(GoodSigners.begin(), GoodSigners.end(), goodlongkeyid) != GoodSigners.end();
+        std::string const goodfingerprint = "GOODSIG " + k;
+        std::string const goodlongkeyid = "GOODSIG " + k.substr(24, 16);
+        foundGood = std::find(GoodSigners.begin(), GoodSigners.end(), goodfingerprint) != GoodSigners.end();

         if (Debug == true)
         if (Debug == true)

-           std::clog << "Key " << key << " is valid sig, is " << goodlongkeyid << " also a good one? " << (foundGood ? "yes" : "no") << std::endl;
-        GoodSigners.clear();
-        if (foundGood)
+           std::clog << "Key " << k << " is valid sig, is " << goodfingerprint << " also a good one? " << (foundGood ? "yes" : "no") << std::endl;
+        std::string goodsig;
+        if (foundGood == false)

         {
         {

-           GoodSigners.push_back(goodlongkeyid);
-           NoPubKeySigners.erase(std::remove(NoPubKeySigners.begin(), NoPubKeySigners.end(), goodlongkeyid), NoPubKeySigners.end());
+           foundGood = std::find(GoodSigners.begin(), GoodSigners.end(), goodlongkeyid) != GoodSigners.end();
+           if (Debug == true)
+              std::clog << "Key " << k << " is valid sig, is " << goodlongkeyid << " also a good one? " << (foundGood ? "yes" : "no") << std::endl;
+           goodsig = goodlongkeyid;

         }
         }

+        else
+           goodsig = goodfingerprint;
+        if (foundGood == false)
+           continue;
+        std::copy(GoodSigners.begin(), GoodSigners.end(), std::back_insert_iterator<std::vector<std::string> >(NoPubKeySigners));
+        GoodSigners.clear();
+        GoodSigners.push_back(goodsig);
+        NoPubKeySigners.erase(
+           std::remove(NoPubKeySigners.begin(),
+              std::remove(NoPubKeySigners.begin(), NoPubKeySigners.end(), goodfingerprint),
+              goodlongkeyid),
+           NoPubKeySigners.end()
+        );
+        break;

       }
       }

-      else
+      if (foundGood == false)
+      {
+        std::copy(GoodSigners.begin(), GoodSigners.end(), std::back_insert_iterator<std::vector<std::string> >(NoPubKeySigners));

         GoodSigners.clear();
         GoodSigners.clear();

+      }

    }
 
    int status;
    }
 
    int status;


@@ -252,8 +302,39 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
    {
       ioprintf(std::clog, "gpgv exited with status %i\n", WEXITSTATUS(status));
    }
    {
       ioprintf(std::clog, "gpgv exited with status %i\n", WEXITSTATUS(status));
    }

-   
-   if (WEXITSTATUS(status) == 0)
+
+   if (Debug)
+   {
+      std::cerr << "Summary:" << std::endl << "  Good: ";
+      std::copy(GoodSigners.begin(), GoodSigners.end(), std::ostream_iterator<std::string>(std::cerr, ", "));
+      std::cerr << std::endl << "  Bad: ";
+      std::copy(BadSigners.begin(), BadSigners.end(), std::ostream_iterator<std::string>(std::cerr, ", "));
+      std::cerr << std::endl << "  Worthless: ";
+      std::copy(WorthlessSigners.begin(), WorthlessSigners.end(), std::ostream_iterator<std::string>(std::cerr, ", "));
+      std::cerr << std::endl << "  SoonWorthless: ";
+      std::for_each(SoonWorthlessSigners.begin(), SoonWorthlessSigners.end(), [](Signer const &sig) { std::cerr << sig.key << ", "; });
+      std::cerr << std::endl << "  NoPubKey: ";
+      std::copy(NoPubKeySigners.begin(), NoPubKeySigners.end(), std::ostream_iterator<std::string>(std::cerr, ", "));
+      std::cerr << std::endl << "  NODATA: " << (gotNODATA ? "yes" : "no") << std::endl;
+   }
+
+   if (WEXITSTATUS(status) == 112)
+   {
+      // acquire system checks for "NODATA" to generate GPG errors (the others are only warnings)
+      std::string errmsg;
+      //TRANSLATORS: %s is a single techy word like 'NODATA'
+      strprintf(errmsg, _("Clearsigned file isn't valid, got '%s' (does the network require authentication?)"), "NODATA");
+      return errmsg;
+   }
+   else if (gotNODATA)
+   {
+      // acquire system checks for "NODATA" to generate GPG errors (the others are only warnings)
+      std::string errmsg;
+      //TRANSLATORS: %s is a single techy word like 'NODATA'
+      strprintf(errmsg, _("Signed file isn't valid, got '%s' (does the network require authentication?)"), "NODATA");
+      return errmsg;
+   }
+   else if (WEXITSTATUS(status) == 0)

    {
       if (keyIsID)
       {
    {
       if (keyIsID)
       {


@@ -273,14 +354,6 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       return _("At least one invalid signature was encountered.");
    else if (WEXITSTATUS(status) == 111)
       return _("Could not execute 'apt-key' to verify signature (is gnupg installed?)");
       return _("At least one invalid signature was encountered.");
    else if (WEXITSTATUS(status) == 111)
       return _("Could not execute 'apt-key' to verify signature (is gnupg installed?)");

-   else if (WEXITSTATUS(status) == 112)
-   {
-      // acquire system checks for "NODATA" to generate GPG errors (the others are only warnings)
-      std::string errmsg;
-      //TRANSLATORS: %s is a single techy word like 'NODATA'
-      strprintf(errmsg, _("Clearsigned file isn't valid, got '%s' (does the network require authentication?)"), "NODATA");
-      return errmsg;
-   }

    else
       return _("Unknown error executing apt-key");
 }
    else
       return _("Unknown error executing apt-key");
 }


@@ -302,15 +375,16 @@ bool GPGVMethod::URIAcquire(std::string const &Message, FetchItem *Itm)
    URIStart(Res);
 
    // Run apt-key on file, extract contents and get the key ID of the signer
    URIStart(Res);
 
    // Run apt-key on file, extract contents and get the key ID of the signer

-   string msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(), key,
+   string const msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(), key,

                                  GoodSigners, BadSigners, WorthlessSigners,
                                  SoonWorthlessSigners, NoPubKeySigners);
                                  GoodSigners, BadSigners, WorthlessSigners,
                                  SoonWorthlessSigners, NoPubKeySigners);

+   if (_error->PendingError())
+      return false;

 
    // Check if all good signers are soon worthless and warn in that case
    if (std::all_of(GoodSigners.begin(), GoodSigners.end(), [&](std::string const &good) {
            return std::any_of(SoonWorthlessSigners.begin(), SoonWorthlessSigners.end(), [&](Signer const &weak) {
 
    // Check if all good signers are soon worthless and warn in that case
    if (std::all_of(GoodSigners.begin(), GoodSigners.end(), [&](std::string const &good) {
            return std::any_of(SoonWorthlessSigners.begin(), SoonWorthlessSigners.end(), [&](Signer const &weak) {

-                 // VALIDSIG reports a keyid (40 = 24 + 16), GOODSIG is a longid (16) only
-                 return weak.key.compare(24, 16, good, strlen("GOODSIG "), 16) == 0;
+                 return IsTheSameKey(weak.key, good);

                  });
            }))
    {
                  });
            }))
    {


@@ -361,14 +435,12 @@ bool GPGVMethod::URIAcquire(std::string const &Message, FetchItem *Itm)
    // structure is too difficult with the method stuff.  We keep it
    // as three separate vectors for future extensibility.
    Res.GPGVOutput = GoodSigners;
    // structure is too difficult with the method stuff.  We keep it
    // as three separate vectors for future extensibility.
    Res.GPGVOutput = GoodSigners;

-   Res.GPGVOutput.insert(Res.GPGVOutput.end(),BadSigners.begin(),BadSigners.end());
-   Res.GPGVOutput.insert(Res.GPGVOutput.end(),NoPubKeySigners.begin(),NoPubKeySigners.end());
+   std::move(BadSigners.begin(), BadSigners.end(), std::back_inserter(Res.GPGVOutput));
+   std::move(NoPubKeySigners.begin(), NoPubKeySigners.end(), std::back_inserter(Res.GPGVOutput));

    URIDone(Res);
 
    URIDone(Res);
 

-   if (_config->FindB("Debug::Acquire::gpgv", false))
-   {
+   if (DebugEnabled())

       std::clog << "apt-key succeeded\n";
       std::clog << "apt-key succeeded\n";

-   }

 
    return true;
 }
 
    return true;
 }


@@ -376,9 +448,5 @@ bool GPGVMethod::URIAcquire(std::string const &Message, FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

-   setlocale(LC_ALL, "");
-
-   GPGVMethod Mth;
-
-   return Mth.Run();
+   return GPGVMethod().Run();

 }
 }