gpgv: Untrust SHA1, RIPE-MD/160, but allow downgrading to weak

[apt.git] / apt-pkg / edsp / edsplistparser.h

diff --git a/apt-pkg/edsp/edsplistparser.h b/apt-pkg/edsp/edsplistparser.h
index 691ac83ed96baa4014ffa0287e339a645ed2eeb3..4904b6567831da54629ea5e254056ac1e2ec9e34 100644 (file)
--- a/apt-pkg/edsp/edsplistparser.h
+++ b/apt-pkg/edsp/edsplistparser.h
@@ -14,6 +14,7 @@
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/pkgcache.h>

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

 
 #include <string>
 
 
 #include <string>
 


@@ -23,27 +24,44 @@
 #include <apt-pkg/tagfile.h>
 #endif
 
 #include <apt-pkg/tagfile.h>
 #endif
 

-class FileFd;
-class edspListParserPrivate;
-
-class APT_HIDDEN edspListParser : public debListParser
+namespace APT {
+   class StringView;
+}
+class APT_HIDDEN edspLikeListParser : public debListParser

 {
 {

-   edspListParserPrivate * const d;

    public:
    virtual bool NewVersion(pkgCache::VerIterator &Ver) APT_OVERRIDE;
    virtual std::vector<std::string> AvailableDescriptionLanguages() APT_OVERRIDE;
    public:
    virtual bool NewVersion(pkgCache::VerIterator &Ver) APT_OVERRIDE;
    virtual std::vector<std::string> AvailableDescriptionLanguages() APT_OVERRIDE;

-   virtual MD5SumValue Description_md5() APT_OVERRIDE;
+   virtual APT::StringView Description_md5() APT_OVERRIDE;

    virtual unsigned short VersionHash() APT_OVERRIDE;
 
    bool LoadReleaseInfo(pkgCache::RlsFileIterator &FileI,FileFd &File,
                        std::string const &section);
 
    virtual unsigned short VersionHash() APT_OVERRIDE;
 
    bool LoadReleaseInfo(pkgCache::RlsFileIterator &FileI,FileFd &File,
                        std::string const &section);
 

+   edspLikeListParser(FileFd *File);
+   virtual ~edspLikeListParser();
+};
+
+class APT_HIDDEN edspListParser : public edspLikeListParser
+{
+   FileFd extendedstates;
+   FileFd preferences;
+
+protected:
+   virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver) APT_OVERRIDE;
+
+public:

    edspListParser(FileFd *File);
    virtual ~edspListParser();
    edspListParser(FileFd *File);
    virtual ~edspListParser();

+};

 
 

-   protected:
+class APT_HIDDEN eippListParser : public edspLikeListParser
+{
+protected:

    virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver) APT_OVERRIDE;
 
    virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver) APT_OVERRIDE;
 

+public:
+   eippListParser(FileFd *File);
+   virtual ~eippListParser();

 };
 };

-

 #endif
 #endif