From 84a0890e6ef49b5d41a0b9ff0b5a5fe95cca6f3e Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 25 Feb 2011 14:16:35 +0100
Subject: move sha512,256 into apt-pkg/sha2.{cc,h}, move gifford implementation
 to sha2_internal.{cc,h}

---
 ftparchive/cachedb.cc | 3 +--
 ftparchive/writer.cc  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'ftparchive')

diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index 699718e57..7e4c2e9fe 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -16,8 +16,7 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
-#include <apt-pkg/sha256.h>
-#include <apt-pkg/sha512.h>
+#include <apt-pkg/sha2.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
     
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index e7eff2045..98ab852ea 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -19,8 +19,7 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
-#include <apt-pkg/sha256.h>
-#include <apt-pkg/sha512.h>
+#include <apt-pkg/sha2.h>
 #include <apt-pkg/deblistparser.h>
 
 #include <sys/types.h>
-- 
cgit v1.2.3