use Pkg.FullName() in disappearedPkgs and remove duplicated check

[apt.git] / methods / gpgv.cc

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 960c06180eede581bdb1ebb0ef687189929ba4b3..ea8a26fd42d0312931091963cfdac9b72274902c 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,9 +1,12 @@
+#include <config.h>
+

 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/indexcopy.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/indexcopy.h>

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

 
 #include <utime.h>
 #include <stdio.h>
 
 #include <utime.h>
 #include <stdio.h>


@@ -12,9 +15,13 @@
 #include <sys/wait.h>
 #include <iostream>
 #include <sstream>
 #include <sys/wait.h>
 #include <iostream>
 #include <sstream>

-

 #include <vector>
 
 #include <vector>
 

+#include <apti18n.h>
+
+using std::string;
+using std::vector;
+

 #define GNUPGPREFIX "[GNUPG:]"
 #define GNUPGBADSIG "[GNUPG:] BADSIG"
 #define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY"
 #define GNUPGPREFIX "[GNUPG:]"
 #define GNUPGBADSIG "[GNUPG:] BADSIG"
 #define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY"


@@ -48,9 +55,6 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
                                         vector<string> &NoPubKeySigners)
 {
    bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);
                                         vector<string> &NoPubKeySigners)
 {
    bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);

-   // setup a (empty) stringstream for formating the return value
-   std::stringstream ret;
-   ret.str("");

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


@@ -64,19 +68,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
    if (pid < 0)
       return string("Couldn't spawn new process") + strerror(errno);
    else if (pid == 0)
    if (pid < 0)
       return string("Couldn't spawn new process") + strerror(errno);
    else if (pid == 0)

-   {
-      _error->PushToStack();
-      bool const success = SigVerify::RunGPGV(outfile, file, 3, fd);
-      if (success == false)
-      {
-        string errmsg;
-        _error->PopMessage(errmsg);
-        _error->RevertToStack();
-        return errmsg;
-      }
-      _error->RevertToStack();
-      exit(111);
-   }
+      ExecGPGV(outfile, file, 3, fd);

    close(fd[1]);
 
    FILE *pipein = fdopen(fd[0], "r");
    close(fd[1]);
 
    FILE *pipein = fdopen(fd[0], "r");


@@ -92,8 +84,16 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       // Read a line.  Sigh.
       while ((c = getc(pipein)) != EOF && c != '\n')
       {
       // Read a line.  Sigh.
       while ((c = getc(pipein)) != EOF && c != '\n')
       {

-         if (bufferoff == buffersize)
-            buffer = (char *) realloc(buffer, buffersize *= 2);
+        if (bufferoff == buffersize)
+        {
+           char* newBuffer = (char *) realloc(buffer, buffersize *= 2);
+           if (newBuffer == NULL)
+           {
+              free(buffer);
+              return "Couldn't allocate a buffer big enough for reading";
+           }
+           buffer = newBuffer;
+        }

          *(buffer+bufferoff) = c;
          bufferoff++;
       }
          *(buffer+bufferoff) = c;
          bufferoff++;
       }


@@ -152,6 +152,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       }
    }
    fclose(pipein);
       }
    }
    fclose(pipein);

+   free(buffer);

 
    int status;
    waitpid(pid, &status, 0);
 
    int status;
    waitpid(pid, &status, 0);


@@ -167,18 +168,19 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       return "";
    }
    else if (WEXITSTATUS(status) == 1)
       return "";
    }
    else if (WEXITSTATUS(status) == 1)

-   {

       return _("At least one invalid signature was encountered.");
       return _("At least one invalid signature was encountered.");

-   }

    else if (WEXITSTATUS(status) == 111)
    else if (WEXITSTATUS(status) == 111)

+      return _("Could not execute 'gpgv' to verify signature (is gpgv installed?)");
+   else if (WEXITSTATUS(status) == 112)

    {
    {

-      ioprintf(ret, _("Could not execute 'gpgv' to verify signature (is gpgv installed?)"));
-      return ret.str();
+      // 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
    }
    else

-   {

       return _("Unknown error executing gpgv");
       return _("Unknown error executing gpgv");

-   }

 }
 
 bool GPGVMethod::Fetch(FetchItem *Itm)
 }
 
 bool GPGVMethod::Fetch(FetchItem *Itm)


@@ -213,21 +215,21 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
          {
             errmsg += _("The following signatures were invalid:\n");
             for (vector<string>::iterator I = BadSigners.begin();
          {
             errmsg += _("The following signatures were invalid:\n");
             for (vector<string>::iterator I = BadSigners.begin();

-                I != BadSigners.end(); I++)
+                I != BadSigners.end(); ++I)

                errmsg += (*I + "\n");
          }
          if (!WorthlessSigners.empty())
          {
             errmsg += _("The following signatures were invalid:\n");
             for (vector<string>::iterator I = WorthlessSigners.begin();
                errmsg += (*I + "\n");
          }
          if (!WorthlessSigners.empty())
          {
             errmsg += _("The following signatures were invalid:\n");
             for (vector<string>::iterator I = WorthlessSigners.begin();

-                I != WorthlessSigners.end(); I++)
+                I != WorthlessSigners.end(); ++I)

                errmsg += (*I + "\n");
          }
          if (!NoPubKeySigners.empty())
          {
              errmsg += _("The following signatures couldn't be verified because the public key is not available:\n");
             for (vector<string>::iterator I = NoPubKeySigners.begin();
                errmsg += (*I + "\n");
          }
          if (!NoPubKeySigners.empty())
          {
              errmsg += _("The following signatures couldn't be verified because the public key is not available:\n");
             for (vector<string>::iterator I = NoPubKeySigners.begin();

-                I != NoPubKeySigners.end(); I++)
+                I != NoPubKeySigners.end(); ++I)

                errmsg += (*I + "\n");
          }
       }
                errmsg += (*I + "\n");
          }
       }