methods/https.cc: use File->Tell() here too

[apt.git] / methods / gpgv.cc

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index fe8bac6c9e17634971113c75ed84f06a5640a439..02fb8c356fcc14d96df066237acfb07584b0b888 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,20 +1,22 @@
 #include <config.h>
 
 #include <config.h>
 

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

 #include <apt-pkg/acquire-method.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/configuration.h>
 #include <apt-pkg/configuration.h>

+#include <apt-pkg/error.h>

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

+#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>

 
 

-#include <utime.h>
-#include <stdio.h>
-#include <fcntl.h>
+#include <ctype.h>

 #include <errno.h>
 #include <errno.h>

+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>

 #include <sys/wait.h>
 #include <sys/wait.h>

+#include <unistd.h>

 #include <iostream>
 #include <iostream>

-#include <sstream>
+#include <string>

 #include <vector>
 
 #include <apti18n.h>
 #include <vector>
 
 #include <apti18n.h>


@@ -73,7 +75,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
 
    FILE *pipein = fdopen(fd[0], "r");
 
 
    FILE *pipein = fdopen(fd[0], "r");
 

-   // Loop over the output of gpgv, and check the signatures.
+   // Loop over the output of apt-key (which really is gnupg), and check the signatures.

    size_t buffersize = 64;
    char *buffer = (char *) malloc(buffersize);
    size_t bufferoff = 0;
    size_t buffersize = 64;
    char *buffer = (char *) malloc(buffersize);
    size_t bufferoff = 0;


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

+   free(buffer);

 
    int status;
    waitpid(pid, &status, 0);
    if (Debug == true)
    {
 
    int status;
    waitpid(pid, &status, 0);
    if (Debug == true)
    {

-      std::clog << "gpgv exited\n";
+      std::clog << "apt-key exited\n";

    }
    
    if (WEXITSTATUS(status) == 0)
    }
    
    if (WEXITSTATUS(status) == 0)


@@ -169,7 +172,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
    else if (WEXITSTATUS(status) == 1)
       return _("At least one invalid signature was encountered.");
    else if (WEXITSTATUS(status) == 111)
    else if (WEXITSTATUS(status) == 1)
       return _("At least one invalid signature was encountered.");
    else if (WEXITSTATUS(status) == 111)

-      return _("Could not execute 'gpgv' to verify signature (is gpgv installed?)");
+      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)
    else if (WEXITSTATUS(status) == 112)
    {
       // acquire system checks for "NODATA" to generate GPG errors (the others are only warnings)


@@ -179,7 +182,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       return errmsg;
    }
    else
       return errmsg;
    }
    else

-      return _("Unknown error executing gpgv");
+      return _("Unknown error executing apt-key");

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


@@ -197,7 +200,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
    Res.Filename = Itm->DestFile;
    URIStart(Res);
 
    Res.Filename = Itm->DestFile;
    URIStart(Res);
 

-   // Run gpgv on file, extract contents and get the key ID of the signer
+   // 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(),
                                  GoodSigners, BadSigners, WorthlessSigners,
                                  NoPubKeySigners);
    string msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(),
                                  GoodSigners, BadSigners, WorthlessSigners,
                                  NoPubKeySigners);


@@ -249,7 +252,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
 
    if (_config->FindB("Debug::Acquire::gpgv", false))
    {
 
    if (_config->FindB("Debug::Acquire::gpgv", false))
    {

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

    }
 
    return true;
    }
 
    return true;


@@ -259,8 +262,10 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
 int main()
 {
    setlocale(LC_ALL, "");
 int main()
 {
    setlocale(LC_ALL, "");

-   
+

    GPGVMethod Mth;
 
    GPGVMethod Mth;
 

+   Mth.DropPrivsOrDie();
+

    return Mth.Run();
 }
    return Mth.Run();
 }