summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-07-10 15:19:09 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2012-07-10 15:19:09 +0200
commitfe5804fc5010dd8f2e9406187bfc1f6afeb29c5a (patch)
tree8df5aed996e0eda63452bdbe1ba5ac42ac5a8fb6 /apt-pkg
parent1c89c98a56df709b4c4477bbd7b86f4e32cee214 (diff)
cherry pick -r1847 from bzr+ssh://bazaar.launchpad.net/~mvo/apt/lp346386/
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire-item.cc3
-rw-r--r--apt-pkg/contrib/fileutl.cc4
-rw-r--r--apt-pkg/contrib/fileutl.h2
-rw-r--r--apt-pkg/indexcopy.cc2
4 files changed, 5 insertions, 6 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index ddd3300f9..665dd427e 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1241,8 +1241,7 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long long Size,string Hash, /
// if we expect a ClearTextSignature (InRelase), ensure that
// this is what we get and if not fail to queue a
// Release/Release.gpg, see #346386
- if (SigFile == DestFile &&
- !IsPgpClearTextSignature(DestFile))
+ if (SigFile == DestFile && !StartsWithGPGClearTextSignature(DestFile))
{
Failed(Message, Cfg);
return;
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index d63195c7d..960616f33 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -852,10 +852,10 @@ bool ExecWait(pid_t Pid,const char *Name,bool Reap)
}
/*}}}*/
-// IsPgpClearTextSignature - Check if a file is Pgp/GPG clearsigned /*{{{*/
+// StartsWithGPGClearTextSignature - Check if a file is Pgp/GPG clearsigned /*{{{*/
// ---------------------------------------------------------------------
/* */
-bool IsPgpClearTextSignature(string const &FileName)
+bool StartsWithGPGClearTextSignature(string const &FileName)
{
static const char* SIGMSG = "-----BEGIN PGP SIGNED MESSAGE-----\n";
char buffer[strlen(SIGMSG)+1];
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 1e16540f7..510b1c984 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -181,7 +181,7 @@ pid_t ExecFork();
bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);
// check if the given file starts with a PGP cleartext signature
-bool IsPgpClearTextSignature(std::string const &FileName);
+bool StartsWithGPGClearTextSignature(std::string const &FileName);
// File string manipulators
std::string flNotDir(std::string File);
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index db3d10ecd..ddf1909b7 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -652,7 +652,7 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG,
if (gpg == NULL)
return _error->Errno("RunGPGV", _("Could not open file %s"), File.c_str());
fclose(gpg);
- if (!IsPgpClearTextSignature(File))
+ if (!StartsWithGPGClearTextSignature(File))
return _error->Error(_("File %s doesn't start with a clearsigned message"), File.c_str());
}