* lp:~mvo/apt/add-glob-function:

[apt.git] / apt-pkg / indexcopy.cc

diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index aa1f01a4a799b263ccf4d1c1c53ed91952509ee8..c0a0853161cbf883c75361fc5a96f5f6fc269779 100644 (file)
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -654,16 +654,12 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG,
 {
    if (File == FileGPG)
    {
 {
    if (File == FileGPG)
    {

-      #define SIGMSG "-----BEGIN PGP SIGNED MESSAGE-----\n"
-      char buffer[sizeof(SIGMSG)];

       FILE* gpg = fopen(File.c_str(), "r");
       if (gpg == NULL)
         return _error->Errno("RunGPGV", _("Could not open file %s"), File.c_str());
       FILE* gpg = fopen(File.c_str(), "r");
       if (gpg == NULL)
         return _error->Errno("RunGPGV", _("Could not open file %s"), File.c_str());

-      char const * const test = fgets(buffer, sizeof(buffer), gpg);

       fclose(gpg);
       fclose(gpg);

-      if (test == NULL || strcmp(buffer, SIGMSG) != 0)
+      if (!StartsWithGPGClearTextSignature(File))

         return _error->Error(_("File %s doesn't start with a clearsigned message"), File.c_str());
         return _error->Error(_("File %s doesn't start with a clearsigned message"), File.c_str());

-      #undef SIGMSG

    }
 
 
    }