Remove code tagged APT_PKG_590, add some missing includes

Remove all code scheduled to be removed after 5.90, and fix
files to include files they previously got from hashes.h
including more headers.

13 files changed, 3 insertions, 2047 deletions

diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h
index b6291572e..5ab7b9f85 100644
--- a/apt-pkg/contrib/error.h
+++ b/apt-pkg/contrib/error.h
@@ -362,6 +362,6 @@ private:								/*{{{*/
 GlobalError *_GetErrorObj();
 static struct {
 	inline GlobalError* operator ->() { return _GetErrorObj(); }
-} _error APT_UNUSED APT_PKG_590("Consider rewriting this");
+} _error APT_UNUSED;
 
 #endif
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index d506a1361..6afd0815f 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -16,6 +16,7 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/macros.h>
+#include <apt-pkg/strutl.h>
 
 #include <algorithm>
 #include <iostream>
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index dad50c564..e2a9927ef 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -13,12 +13,10 @@
 #define APTPKG_HASHES_H
 
 #include <apt-pkg/macros.h>
-#include <apt-pkg/md5.h>
-#include <apt-pkg/sha1.h>
-#include <apt-pkg/sha2.h>
 
 #include <cstring>
 #include <string>
+#include <vector>
 
 
 
@@ -171,15 +169,6 @@ class PrivateHashes;
 class Hashes
 {
    PrivateHashes * const d;
-APT_IGNORE_DEPRECATED_PUSH
-   /* TODO: those will disappear in the future as it is hard to add new ones this way.
-    * Use Add* to build the results and get them via GetHashStringList() instead */
-   MD5Summation MD5 APT_PKG_590("Remove");
-   SHA1Summation SHA1 APT_PKG_590("Remove");
-   SHA256Summation SHA256 APT_PKG_590("Remove");
-   SHA512Summation SHA512 APT_PKG_590("Remove");
-APT_IGNORE_DEPRECATED_POP
-
    public:
    static const int UntilEOF = 0;
 
diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h
index 689d86578..f37eb585b 100644
--- a/apt-pkg/contrib/macros.h
+++ b/apt-pkg/contrib/macros.h
@@ -121,13 +121,6 @@
 #define APT_PKG_RELEASE 0
 #define APT_PKG_ABI ((APT_PKG_MAJOR * 100) + APT_PKG_MINOR)
 
-
-#if APT_PKG_ABI > 590
-#define APT_PKG_590(msg)  __attribute__((error(msg)))
-#else
-#define APT_PKG_590(msg)
-#endif
-
 /* Should be a multiple of the common page size (4096) */
 static constexpr unsigned long long APT_BUFFER_SIZE = 64 * 1024;
 
diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
deleted file mode 100644
index c3b529922..000000000
--- a/apt-pkg/contrib/md5.cc
+++ /dev/null
@@ -1,279 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description								/*{{{*/
-/* ######################################################################
-   
-   MD5Sum - MD5 Message Digest Algorithm.
-
-   This code implements the MD5 message-digest algorithm. The algorithm is 
-   due to Ron Rivest.  This code was written by Colin Plumb in 1993, no 
-   copyright is claimed. This code is in the public domain; do with it what 
-   you wish.
- 
-   Equivalent code is available from RSA Data Security, Inc. This code has 
-   been tested against that, and is equivalent, except that you don't need to 
-   include two pages of legalese with every copy.
-
-   To compute the message digest of a chunk of bytes, instantiate the class,
-   and repeatedly call one of the Add() members. When finished the Result 
-   method will return the Hash and finalize the value.
-   
-   Changed so as no longer to depend on Colin Plumb's `usual.h' header
-   definitions; now uses stuff from dpkg's config.h.
-    - Ian Jackson <ijackson@nyx.cs.du.edu>.
-   
-   Changed into a C++ interface and made work with APT's config.h.
-    - Jason Gunthorpe <jgg@gpu.srv.ualberta.ca>
-   
-   Still in the public domain.
-
-   The classes use arrays of char that are a specific size. We cast those
-   arrays to uint8_t's and go from there. This allows us to advoid using
-   the uncommon inttypes.h in a public header or internally newing memory.
-   In theory if C9x becomes nicely accepted
-   
-   ##################################################################### */
-									/*}}}*/
-// Include Files							/*{{{*/
-#include <config.h>
-
-#include <apt-pkg/md5.h>
-
-#include <stdint.h>
-#include <string.h>
-									/*}}}*/
-
-// byteSwap - Swap bytes in a buffer					/*{{{*/
-// ---------------------------------------------------------------------
-/* Swap n 32 bit longs in given buffer */
-#ifdef WORDS_BIGENDIAN
-static void byteSwap(uint32_t *buf, unsigned words)
-{
-   uint8_t *p = (uint8_t *)buf;
-   
-   do 
-   {
-      *buf++ = (uint32_t)((unsigned)p[3] << 8 | p[2]) << 16 |
-	 ((unsigned)p[1] << 8 | p[0]);
-      p += 4;
-   } while (--words);
-}
-#else
-#define byteSwap(buf,words)
-#endif
-									/*}}}*/
-// MD5Transform - Alters an existing MD5 hash				/*{{{*/
-// ---------------------------------------------------------------------
-/* The core of the MD5 algorithm, this alters an existing MD5 hash to
-   reflect the addition of 16 longwords of new data. Add blocks
-   the data and converts bytes into longwords for this routine. */
-
-// The four core functions - F1 is optimized somewhat
-// #define F1(x, y, z) (x & y | ~x & z)
-#define F1(x, y, z) (z ^ (x & (y ^ z)))
-#define F2(x, y, z) F1(z, x, y)
-#define F3(x, y, z) (x ^ y ^ z)
-#define F4(x, y, z) (y ^ (x | ~z))
-
-// This is the central step in the MD5 algorithm.
-#define MD5STEP(f,w,x,y,z,in,s) \
-	 (w += f(x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
-
-static void MD5Transform(uint32_t buf[4], uint32_t const in[16])
-{
-   uint32_t a, b, c, d;
-   
-   a = buf[0];
-   b = buf[1];
-   c = buf[2];
-   d = buf[3];
-   
-   MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
-   MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
-   MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
-   MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
-   MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
-   MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
-   MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
-   MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
-   MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
-   MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
-   MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
-   MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
-   MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
-   MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
-   MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
-   MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
-
-   MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
-   MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
-   MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
-   MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
-   MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
-   MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
-   MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
-   MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
-   MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
-   MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
-   MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
-   MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
-   MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
-   MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
-   MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
-   MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-   
-   MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
-   MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
-   MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
-   MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
-   MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
-   MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
-   MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
-   MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
-   MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
-   MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
-   MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
-   MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
-   MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
-   MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
-   MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
-   MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-   
-   MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
-   MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
-   MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
-   MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
-   MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
-   MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
-   MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
-   MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
-   MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
-   MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
-   MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
-   MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
-   MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
-   MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
-   MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
-   MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
-   
-   buf[0] += a;
-   buf[1] += b;
-   buf[2] += c;
-   buf[3] += d;
-}
-									/*}}}*/
-// MD5Summation::MD5Summation - Initialize the summer			/*{{{*/
-// ---------------------------------------------------------------------
-/* This assigns the deep magic initial values */
-MD5Summation::MD5Summation()
-{
-   uint32_t *buf = (uint32_t *)Buf;
-   uint32_t *bytes = (uint32_t *)Bytes;
-   
-   buf[0] = 0x67452301;
-   buf[1] = 0xefcdab89;
-   buf[2] = 0x98badcfe;
-   buf[3] = 0x10325476;
-   
-   bytes[0] = 0;
-   bytes[1] = 0;
-   Done = false;
-}
-									/*}}}*/
-// MD5Summation::Add - 'Add' a data set to the hash			/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool MD5Summation::Add(const unsigned char *data,unsigned long long len)
-{
-   if (Done == true)
-      return false;
-   if (len == 0)
-      return true;
-
-   uint32_t *buf = (uint32_t *)Buf;
-   uint32_t *bytes = (uint32_t *)Bytes;
-   uint32_t *in = (uint32_t *)In;
-
-   // Update byte count and carry (this could be done with a long long?)
-   uint32_t t = bytes[0];
-   if ((bytes[0] = t + len) < t)
-      bytes[1]++;	
-
-   // Space available (at least 1)
-   t = 64 - (t & 0x3f);	
-   if (t > len) 
-   {
-      memcpy((unsigned char *)in + 64 - t,data,len);
-      return true;
-   }
-
-   // First chunk is an odd size
-   memcpy((unsigned char *)in + 64 - t,data,t);
-   byteSwap(in, 16);
-   MD5Transform(buf,in);
-   data += t;
-   len -= t;
-   
-   // Process data in 64-byte chunks
-   while (len >= 64)
-   {
-      memcpy(in,data,64);
-      byteSwap(in,16);
-      MD5Transform(buf,in);
-      data += 64;
-      len -= 64;
-   }
-
-   // Handle any remaining bytes of data.
-   memcpy(in,data,len);
-
-   return true;   
-}
-									/*}}}*/
-// MD5Summation::Result - Returns the value of the sum			/*{{{*/
-// ---------------------------------------------------------------------
-/* Because this must add in the last bytes of the series it prevents anyone
-   from calling add after. */
-MD5SumValue MD5Summation::Result()
-{
-   uint32_t *buf = (uint32_t *)Buf;
-   uint32_t *bytes = (uint32_t *)Bytes;
-   uint32_t *in = (uint32_t *)In;
-   
-   if (Done == false)
-   {
-      // Number of bytes in In
-      int count = bytes[0] & 0x3f;	
-      unsigned char *p = (unsigned char *)in + count;
-      
-      // Set the first char of padding to 0x80.  There is always room.
-      *p++ = 0x80;
-      
-      // Bytes of padding needed to make 56 bytes (-8..55)
-      count = 56 - 1 - count;
-      
-      // Padding forces an extra block 
-      if (count < 0) 
-      {
-	 memset(p,0,count + 8);
-	 byteSwap(in, 16);
-	 MD5Transform(buf,in);
-	 p = (unsigned char *)in;
-	 count = 56;
-      }
-      
-      memset(p, 0, count);
-      byteSwap(in, 14);
-      
-      // Append length in bits and transform
-      in[14] = bytes[0] << 3;
-      in[15] = bytes[1] << 3 | bytes[0] >> 29;
-      MD5Transform(buf,in);   
-      byteSwap(buf,4);
-      Done = true;
-   }
-   
-   MD5SumValue V;
-   V.Set((unsigned char *)buf);
-   return V;
-}
-									/*}}}*/
diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
deleted file mode 100644
index de0699f6a..000000000
--- a/apt-pkg/contrib/md5.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description								/*{{{*/
-/* ######################################################################
-   
-   MD5SumValue - Storage for a MD5Sum
-   MD5Summation - MD5 Message Digest Algorithm.
-   
-   This is a C++ interface to a set of MD5Sum functions. The class can
-   store a MD5Sum in 16 bytes of memory.
-   
-   A MD5Sum is used to generate a (hopefully) unique 16 byte number for a
-   block of data. This can be used to guard against corruption of a file.
-   MD5 should not be used for tamper protection, use SHA or something more
-   secure.
-   
-   There are two classes because computing a MD5 is not a continual 
-   operation unless 64 byte blocks are used. Also the summation requires an
-   extra 18*4 bytes to operate.
-   
-   ##################################################################### */
-									/*}}}*/
-#ifndef APTPKG_MD5_H
-#define APTPKG_MD5_H
-
-#include <stdint.h>
-
-#include "hashsum_template.h"
-
-
-typedef HashSumValue<128> MD5SumValue;
-
-class APT_DEPRECATED_MSG("Use Hashes instead") APT_PKG_590("Remove") MD5Summation : public SummationImplementation
-{
-   uint32_t Buf[4];
-   unsigned char Bytes[2*4];
-   unsigned char In[16*4];
-   bool Done;
-
-   public:
-
-   bool Add(const unsigned char *inbuf, unsigned long long inlen) APT_OVERRIDE APT_NONNULL(2);
-   using SummationImplementation::Add;
-
-   MD5SumValue Result();
-
-   MD5Summation();
-};
-
-#endif
diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
deleted file mode 100644
index bf0b9d634..000000000
--- a/apt-pkg/contrib/sha1.cc
+++ /dev/null
@@ -1,273 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description                                                          /*{{{*/
-/* ######################################################################
-   
-   SHA1 - SHA-1 Secure Hash Algorithm.
-   
-   This file is a Public Domain wrapper for the Public Domain SHA1 
-   calculation code that is at it's end.
-
-   The algorithm was originally implemented by 
-   Steve Reid <sreid@sea-to-sky.net> and later modified by 
-   James H. Brown <jbrown@burgoyne.com>.
-   
-   Modifications for APT were done by Alfredo K. Kojima and Jason 
-   Gunthorpe.
-   
-   Still in the public domain.
-   
-   Test Vectors (from FIPS PUB 180-1)
-   "abc"
-   A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
-   "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
-   84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
-   A million repetitions of "a"
-   34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
-   
-   ##################################################################### 
- */
-									/*}}} */
-// Include Files                                                        /*{{{*/
-#include <config.h>
-
-#include <apt-pkg/sha1.h>
-
-#include <stdint.h>
-#include <string.h>
-									/*}}}*/
-
-// SHA1Transform - Alters an existing SHA-1 hash			/*{{{*/
-// ---------------------------------------------------------------------
-/* The core of the SHA-1 algorithm. This alters an existing SHA-1 hash to
-   reflect the addition of 16 longwords of new data. Other routines convert
-   incoming stream data into 16 long word chunks for this routine */
-
-#define rol(value,bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
-
-/* blk0() and blk() perform the initial expand. */
-/* I got the idea of expanding during the round function from SSLeay */
-#ifndef WORDS_BIGENDIAN
-#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
-    |(rol(block->l[i],8)&0x00FF00FF))
-#else
-#define blk0(i) block->l[i]
-#endif
-#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
-    ^block->l[(i+2)&15]^block->l[i&15],1))
-
-/* (R0+R1),R2,R3,R4 are the different operations used in SHA1 */
-#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
-#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
-#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
-
-static void SHA1Transform(uint32_t state[5],uint8_t const buffer[64])
-{
-   uint32_t a,b,c,d,e;
-   typedef union
-   {
-      uint8_t c[64];
-      uint32_t l[16];
-   }
-   CHAR64LONG16;
-   CHAR64LONG16 workspace, *block;
-
-   block = &workspace;
-   memcpy(block,buffer,sizeof(workspace));
-
-   /* Copy context->state[] to working vars */
-   a = state[0];
-   b = state[1];
-   c = state[2];
-   d = state[3];
-   e = state[4];
-   
-   /* 4 rounds of 20 operations each. Loop unrolled. */
-   R0(a,b,c,d,e,0);
-   R0(e,a,b,c,d,1);
-   R0(d,e,a,b,c,2);
-   R0(c,d,e,a,b,3);
-   R0(b,c,d,e,a,4);
-   R0(a,b,c,d,e,5);
-   R0(e,a,b,c,d,6);
-   R0(d,e,a,b,c,7);
-   R0(c,d,e,a,b,8);
-   R0(b,c,d,e,a,9);
-   R0(a,b,c,d,e,10);
-   R0(e,a,b,c,d,11);
-   R0(d,e,a,b,c,12);
-   R0(c,d,e,a,b,13);
-   R0(b,c,d,e,a,14);
-   R0(a,b,c,d,e,15);
-   R1(e,a,b,c,d,16);
-   R1(d,e,a,b,c,17);
-   R1(c,d,e,a,b,18);
-   R1(b,c,d,e,a,19);
-   R2(a,b,c,d,e,20);
-   R2(e,a,b,c,d,21);
-   R2(d,e,a,b,c,22);
-   R2(c,d,e,a,b,23);
-   R2(b,c,d,e,a,24);
-   R2(a,b,c,d,e,25);
-   R2(e,a,b,c,d,26);
-   R2(d,e,a,b,c,27);
-   R2(c,d,e,a,b,28);
-   R2(b,c,d,e,a,29);
-   R2(a,b,c,d,e,30);
-   R2(e,a,b,c,d,31);
-   R2(d,e,a,b,c,32);
-   R2(c,d,e,a,b,33);
-   R2(b,c,d,e,a,34);
-   R2(a,b,c,d,e,35);
-   R2(e,a,b,c,d,36);
-   R2(d,e,a,b,c,37);
-   R2(c,d,e,a,b,38);
-   R2(b,c,d,e,a,39);
-   R3(a,b,c,d,e,40);
-   R3(e,a,b,c,d,41);
-   R3(d,e,a,b,c,42);
-   R3(c,d,e,a,b,43);
-   R3(b,c,d,e,a,44);
-   R3(a,b,c,d,e,45);
-   R3(e,a,b,c,d,46);
-   R3(d,e,a,b,c,47);
-   R3(c,d,e,a,b,48);
-   R3(b,c,d,e,a,49);
-   R3(a,b,c,d,e,50);
-   R3(e,a,b,c,d,51);
-   R3(d,e,a,b,c,52);
-   R3(c,d,e,a,b,53);
-   R3(b,c,d,e,a,54);
-   R3(a,b,c,d,e,55);
-   R3(e,a,b,c,d,56);
-   R3(d,e,a,b,c,57);
-   R3(c,d,e,a,b,58);
-   R3(b,c,d,e,a,59);
-   R4(a,b,c,d,e,60);
-   R4(e,a,b,c,d,61);
-   R4(d,e,a,b,c,62);
-   R4(c,d,e,a,b,63);
-   R4(b,c,d,e,a,64);
-   R4(a,b,c,d,e,65);
-   R4(e,a,b,c,d,66);
-   R4(d,e,a,b,c,67);
-   R4(c,d,e,a,b,68);
-   R4(b,c,d,e,a,69);
-   R4(a,b,c,d,e,70);
-   R4(e,a,b,c,d,71);
-   R4(d,e,a,b,c,72);
-   R4(c,d,e,a,b,73);
-   R4(b,c,d,e,a,74);
-   R4(a,b,c,d,e,75);
-   R4(e,a,b,c,d,76);
-   R4(d,e,a,b,c,77);
-   R4(c,d,e,a,b,78);
-   R4(b,c,d,e,a,79);
-   
-   /* Add the working vars back into context.state[] */
-   state[0] += a;
-   state[1] += b;
-   state[2] += c;
-   state[3] += d;
-   state[4] += e;   
-}
-									/*}}}*/
-
-// SHA1Summation::SHA1Summation - Constructor                           /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-SHA1Summation::SHA1Summation()
-{
-   uint32_t *state = (uint32_t *)State;
-   uint32_t *count = (uint32_t *)Count;
-   
-   /* SHA1 initialization constants */
-   state[0] = 0x67452301;
-   state[1] = 0xEFCDAB89;
-   state[2] = 0x98BADCFE;
-   state[3] = 0x10325476;
-   state[4] = 0xC3D2E1F0;
-   count[0] = 0;
-   count[1] = 0;
-   Done = false;
-}
-									/*}}}*/
-// SHA1Summation::Result - Return checksum value                        /*{{{*/
-// ---------------------------------------------------------------------
-/* Add() may not be called after this */
-SHA1SumValue SHA1Summation::Result()
-{
-   uint32_t *state = (uint32_t *)State;
-   uint32_t *count = (uint32_t *)Count;
-   
-   // Apply the padding
-   if (Done == false)
-   {
-      unsigned char finalcount[8];
-
-      for (unsigned i = 0; i < 8; i++)
-      {
-	 // Endian independent
-	 finalcount[i] = (unsigned char) ((count[(i >= 4 ? 0 : 1)]
-					   >> ((3 - (i & 3)) * 8)) & 255);	
-      }
-      
-      Add((unsigned char *) "\200",1);
-      while ((count[0] & 504) != 448)
-	 Add((unsigned char *) "\0",1);
-      
-      Add(finalcount,8);	/* Should cause a SHA1Transform() */
-      
-   }
-
-   Done = true;
-
-   // Transfer over the result
-   SHA1SumValue Value;
-   unsigned char res[20];
-   for (unsigned i = 0; i < 20; i++)
-   {
-      res[i] = (unsigned char)
-	 ((state[i >> 2] >> ((3 - (i & 3)) * 8)) & 255);
-   }
-   Value.Set(res);
-   return Value;
-}
-									/*}}}*/
-// SHA1Summation::Add - Adds content of buffer into the checksum        /*{{{*/
-// ---------------------------------------------------------------------
-/* May not be called after Result() is called */
-bool SHA1Summation::Add(const unsigned char *data,unsigned long long len)
-{
-   if (Done)
-      return false;
-   if (len == 0)
-      return true;
-
-   uint32_t *state = (uint32_t *)State;
-   uint32_t *count = (uint32_t *)Count;
-   uint8_t *buffer = (uint8_t *)Buffer;
-   uint32_t i,j;
-
-   j = (count[0] >> 3) & 63;
-   if ((count[0] += len << 3) < (len << 3))
-      count[1]++;
-   count[1] += (len >> 29);
-   if ((j + len) > 63)
-   {
-      memcpy(&buffer[j],data,(i = 64 - j));
-      SHA1Transform(state,buffer);
-      for (; i + 63 < len; i += 64)
-      {
-	 SHA1Transform(state,&data[i]);
-      }
-      j = 0;
-   }
-   else
-      i = 0;
-   memcpy(&buffer[j],&data[i],len - i);
-   
-   return true;
-}
-									/*}}}*/
diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
deleted file mode 100644
index 5d16cbd16..000000000
--- a/apt-pkg/contrib/sha1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description								/*{{{*/
-/* ######################################################################
-
-   SHA1SumValue - Storage for a SHA-1 hash.
-   SHA1Summation - SHA-1 Secure Hash Algorithm.
-   
-   This is a C++ interface to a set of SHA1Sum functions, that mirrors
-   the equivalent MD5 classes. 
-
-   ##################################################################### */
-									/*}}}*/
-#ifndef APTPKG_SHA1_H
-#define APTPKG_SHA1_H
-
-#include "hashsum_template.h"
-
-
-typedef  HashSumValue<160> SHA1SumValue;
-
-class APT_DEPRECATED_MSG("Use Hashes instead") APT_PKG_590("Remove") SHA1Summation : public SummationImplementation
-{
-   /* assumes 64-bit alignment just in case */
-   unsigned char Buffer[64] __attribute__((aligned(8)));
-   unsigned char State[5*4] __attribute__((aligned(8)));
-   unsigned char Count[2*4] __attribute__((aligned(8)));
-   bool Done;
-   
-   public:
-   bool Add(const unsigned char *inbuf, unsigned long long inlen) APT_OVERRIDE APT_NONNULL(2);
-   using SummationImplementation::Add;
-
-   SHA1SumValue Result();
-   
-   SHA1Summation();
-};
-
-#endif
diff --git a/apt-pkg/contrib/sha2.h b/apt-pkg/contrib/sha2.h
deleted file mode 100644
index 9e179b43c..000000000
--- a/apt-pkg/contrib/sha2.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description                                                          /*{{{*/
-/* ######################################################################
-
-   SHA{512,256}SumValue - Storage for a SHA-{512,256} hash.
-   SHA{512,256}Summation - SHA-{512,256} Secure Hash Algorithm.
-   
-   This is a C++ interface to a set of SHA{512,256}Sum functions, that mirrors
-   the equivalent MD5 & SHA1 classes. 
-
-   ##################################################################### */
-                                                                        /*}}}*/
-#ifndef APTPKG_SHA2_H
-#define APTPKG_SHA2_H
-
-#include <cstring>
-
-#include "hashsum_template.h"
-#include "sha2_internal.h"
-
-
-
-typedef HashSumValue<512> SHA512SumValue;
-typedef HashSumValue<256> SHA256SumValue;
-
-class SHA2SummationBase : public SummationImplementation
-{
- protected:
-   bool Done;
- public:
-   bool Add(const unsigned char *inbuf, unsigned long long len) APT_OVERRIDE APT_NONNULL(2) = 0;
-
-   void Result();
-};
-
-class APT_DEPRECATED_MSG("Use Hashes instead") APT_PKG_590("Remove") SHA256Summation : public SHA2SummationBase
-{
-   SHA256_CTX ctx;
-   unsigned char Sum[32];
-
-   public:
-   bool Add(const unsigned char *inbuf, unsigned long long len) APT_OVERRIDE APT_NONNULL(2)
-   {
-      if (Done) 
-         return false;
-      SHA256_Update(&ctx, inbuf, len);
-      return true;
-   };
-   using SummationImplementation::Add;
-
-   SHA256SumValue Result()
-   {
-      if (!Done) {
-         SHA256_Final(Sum, &ctx);
-         Done = true;
-      }
-      SHA256SumValue res;
-      res.Set(Sum);
-      return res;
-   };
-   SHA256Summation()
-   {
-      SHA256_Init(&ctx);
-      Done = false;
-      memset(&Sum, 0, sizeof(Sum));
-   };
-};
-
-class APT_DEPRECATED_MSG("Use Hashes instead") APT_PKG_590("Remove") SHA512Summation : public SHA2SummationBase
-{
-   SHA512_CTX ctx;
-   unsigned char Sum[64];
-
-   public:
-   bool Add(const unsigned char *inbuf, unsigned long long len) APT_OVERRIDE APT_NONNULL(2)
-   {
-      if (Done) 
-         return false;
-      SHA512_Update(&ctx, inbuf, len);
-      return true;
-   };
-   using SummationImplementation::Add;
-
-   SHA512SumValue Result()
-   {
-      if (!Done) {
-         SHA512_Final(Sum, &ctx);
-         Done = true;
-      }
-      SHA512SumValue res;
-      res.Set(Sum);
-      return res;
-   };
-   SHA512Summation()
-   {
-      SHA512_Init(&ctx);
-      Done = false;
-      memset(&Sum, 0, sizeof(Sum));
-   };
-};
-
-
-#endif
diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h
deleted file mode 100644
index 93b2bc09e..000000000
--- a/apt-pkg/contrib/sha256.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef APTPKG_SHA256_H
-#define APTPKG_SHA256_H
-
-
-#warning "This header is deprecated, please include sha2.h instead"
-
-#endif
diff --git a/apt-pkg/contrib/sha2_internal.cc b/apt-pkg/contrib/sha2_internal.cc
deleted file mode 100644
index 92a4a8619..000000000
--- a/apt-pkg/contrib/sha2_internal.cc
+++ /dev/null
@@ -1,1089 +0,0 @@
-/*
- * FILE:	sha2.c
- * AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
- * 
- * Copyright (c) 2000-2001, Aaron D. Gifford
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-#include <config.h>
-
-#include "sha2_internal.h"
-#include <assert.h> /* assert() */
-#include <endian.h>
-#include <string.h> /* memcpy()/memset() or bcopy()/bzero() */
-
-/*
- * ASSERT NOTE:
- * Some sanity checking code is included using assert().  On my FreeBSD
- * system, this additional code can be removed by compiling with NDEBUG
- * defined.  Check your own systems manpage on assert() to see how to
- * compile WITHOUT the sanity checking code on your system.
- *
- * UNROLLED TRANSFORM LOOP NOTE:
- * You can define SHA2_UNROLL_TRANSFORM to use the unrolled transform
- * loop version for the hash transform rounds (defined using macros
- * later in this file).  Either define on the command line, for example:
- *
- *   cc -DSHA2_UNROLL_TRANSFORM -o sha2 sha2.c sha2prog.c
- *
- * or define below:
- *
- *   #define SHA2_UNROLL_TRANSFORM
- *
- */
-
-
-/*** SHA-256/384/512 Machine Architecture Definitions *****************/
-/*
- * BYTE_ORDER NOTE:
- *
- * Please make sure that your system defines BYTE_ORDER.  If your
- * architecture is little-endian, make sure it also defines
- * LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are
- * equivalent.
- *
- * If your system does not define the above, then you can do so by
- * hand like this:
- *
- *   #define LITTLE_ENDIAN 1234
- *   #define BIG_ENDIAN    4321
- *
- * And for little-endian machines, add:
- *
- *   #define BYTE_ORDER LITTLE_ENDIAN 
- *
- * Or for big-endian machines:
- *
- *   #define BYTE_ORDER BIG_ENDIAN
- *
- * The FreeBSD machine this was written on defines BYTE_ORDER
- * appropriately by including <sys/types.h> (which in turn includes
- * <machine/endian.h> where the appropriate definitions are actually
- * made).
- */
-#if !defined(BYTE_ORDER) || (BYTE_ORDER != LITTLE_ENDIAN && BYTE_ORDER != BIG_ENDIAN)
-#error Define BYTE_ORDER to be equal to either LITTLE_ENDIAN or BIG_ENDIAN
-#endif
-
-/*
- * Define the followingsha2_* types to types of the correct length on
- * the native architecture.   Most BSD systems and Linux define u_intXX_t
- * types.  Machines with very recent ANSI C headers, can use the
- * uintXX_t definintions from inttypes.h by defining SHA2_USE_INTTYPES_H
- * during compile or in the sha.h header file.
- *
- * Machines that support neither u_intXX_t nor inttypes.h's uintXX_t
- * will need to define these three typedefs below (and the appropriate
- * ones in sha.h too) by hand according to their system architecture.
- *
- * Thank you, Jun-ichiro itojun Hagino, for suggesting using u_intXX_t
- * types and pointing out recent ANSI C support for uintXX_t in inttypes.h.
- */
-#ifdef SHA2_USE_INTTYPES_H
-
-typedef uint8_t  sha2_byte;	/* Exactly 1 byte */
-typedef uint32_t sha2_word32;	/* Exactly 4 bytes */
-typedef uint64_t sha2_word64;	/* Exactly 8 bytes */
-
-#else /* SHA2_USE_INTTYPES_H */
-
-typedef u_int8_t  sha2_byte;	/* Exactly 1 byte */
-typedef u_int32_t sha2_word32;	/* Exactly 4 bytes */
-typedef u_int64_t sha2_word64;	/* Exactly 8 bytes */
-
-#endif /* SHA2_USE_INTTYPES_H */
-
-
-/*** SHA-256/384/512 Various Length Definitions ***********************/
-/* NOTE: Most of these are in sha2.h */
-#define SHA256_SHORT_BLOCK_LENGTH	(SHA256_BLOCK_LENGTH - 8)
-#define SHA384_SHORT_BLOCK_LENGTH	(SHA384_BLOCK_LENGTH - 16)
-#define SHA512_SHORT_BLOCK_LENGTH	(SHA512_BLOCK_LENGTH - 16)
-
-
-/*** ENDIAN REVERSAL MACROS *******************************************/
-#if BYTE_ORDER == LITTLE_ENDIAN
-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
-#define REVERSE32(w,x)	{ \
-	(x) = __builtin_bswap32(w); \
-}
-#define REVERSE64(w,x)	{ \
-	(x) = __builtin_bswap64(w); \
-}
-#else
-#define REVERSE32(w,x)	{ \
-	sha2_word32 tmp = (w); \
-	tmp = (tmp >> 16) | (tmp << 16); \
-	(x) = ((tmp & 0xff00ff00UL) >> 8) | ((tmp & 0x00ff00ffUL) << 8); \
-}
-#define REVERSE64(w,x)	{ \
-	sha2_word64 tmp = (w); \
-	tmp = (tmp >> 32) | (tmp << 32); \
-	tmp = ((tmp & 0xff00ff00ff00ff00ULL) >> 8) | \
-	      ((tmp & 0x00ff00ff00ff00ffULL) << 8); \
-	(x) = ((tmp & 0xffff0000ffff0000ULL) >> 16) | \
-	      ((tmp & 0x0000ffff0000ffffULL) << 16); \
-}
-#endif
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
-/*
- * Macro for incrementally adding the unsigned 64-bit integer n to the
- * unsigned 128-bit integer (represented using a two-element array of
- * 64-bit words):
- */
-#define ADDINC128(w,n)	{ \
-	(w)[0] += (sha2_word64)(n); \
-	if ((w)[0] < (n)) { \
-		(w)[1]++; \
-	} \
-}
-
-/*
- * Macros for copying blocks of memory and for zeroing out ranges
- * of memory.  Using these macros makes it easy to switch from
- * using memset()/memcpy() and using bzero()/bcopy().
- *
- * Please define either SHA2_USE_MEMSET_MEMCPY or define
- * SHA2_USE_BZERO_BCOPY depending on which function set you
- * choose to use:
- */
-#if !defined(SHA2_USE_MEMSET_MEMCPY) && !defined(SHA2_USE_BZERO_BCOPY)
-/* Default to memset()/memcpy() if no option is specified */
-#define	SHA2_USE_MEMSET_MEMCPY	1
-#endif
-#if defined(SHA2_USE_MEMSET_MEMCPY) && defined(SHA2_USE_BZERO_BCOPY)
-/* Abort with an error if BOTH options are defined */
-#error Define either SHA2_USE_MEMSET_MEMCPY or SHA2_USE_BZERO_BCOPY, not both!
-#endif
-
-#ifdef SHA2_USE_MEMSET_MEMCPY
-#define MEMSET_BZERO(p,l)	memset((p), 0, (l))
-#define MEMCPY_BCOPY(d,s,l)	memcpy((d), (s), (l))
-#endif
-#ifdef SHA2_USE_BZERO_BCOPY
-#define MEMSET_BZERO(p,l)	bzero((p), (l))
-#define MEMCPY_BCOPY(d,s,l)	bcopy((s), (d), (l))
-#endif
-
-
-/*** THE SIX LOGICAL FUNCTIONS ****************************************/
-/*
- * Bit shifting and rotation (used by the six SHA-XYZ logical functions:
- *
- *   NOTE:  The naming of R and S appears backwards here (R is a SHIFT and
- *   S is a ROTATION) because the SHA-256/384/512 description document
- *   (see http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf) uses this
- *   same "backwards" definition.
- */
-/* Shift-right (used in SHA-256, SHA-384, and SHA-512): */
-#define R(b,x) 		((x) >> (b))
-/* 32-bit Rotate-right (used in SHA-256): */
-#define S32(b,x)	(((x) >> (b)) | ((x) << (32 - (b))))
-/* 64-bit Rotate-right (used in SHA-384 and SHA-512): */
-#define S64(b,x)	(((x) >> (b)) | ((x) << (64 - (b))))
-
-/* Two of six logical functions used in SHA-256, SHA-384, and SHA-512: */
-#define Ch(x,y,z)	(((x) & (y)) ^ ((~(x)) & (z)))
-#define Maj(x,y,z)	(((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
-
-/* Four of six logical functions used in SHA-256: */
-#define Sigma0_256(x)	(S32(2,  (x)) ^ S32(13, (x)) ^ S32(22, (x)))
-#define Sigma1_256(x)	(S32(6,  (x)) ^ S32(11, (x)) ^ S32(25, (x)))
-#define sigma0_256(x)	(S32(7,  (x)) ^ S32(18, (x)) ^ R(3 ,   (x)))
-#define sigma1_256(x)	(S32(17, (x)) ^ S32(19, (x)) ^ R(10,   (x)))
-
-/* Four of six logical functions used in SHA-384 and SHA-512: */
-#define Sigma0_512(x)	(S64(28, (x)) ^ S64(34, (x)) ^ S64(39, (x)))
-#define Sigma1_512(x)	(S64(14, (x)) ^ S64(18, (x)) ^ S64(41, (x)))
-#define sigma0_512(x)	(S64( 1, (x)) ^ S64( 8, (x)) ^ R( 7,   (x)))
-#define sigma1_512(x)	(S64(19, (x)) ^ S64(61, (x)) ^ R( 6,   (x)))
-
-/*** INTERNAL FUNCTION PROTOTYPES *************************************/
-/* NOTE: These should not be accessed directly from outside this
- * library -- they are intended for private internal visibility/use
- * only.
- */
-static void SHA512_Last(SHA512_CTX*);
-static void SHA256_Transform(SHA256_CTX*, const sha2_word32*);
-static void SHA512_Transform(SHA512_CTX*, const sha2_word64*);
-
-
-/*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/
-/* Hash constant words K for SHA-256: */
-const static sha2_word32 K256[64] = {
-	0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL,
-	0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL,
-	0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL,
-	0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, 0xc19bf174UL,
-	0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
-	0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL,
-	0x983e5152UL, 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL,
-	0xc6e00bf3UL, 0xd5a79147UL, 0x06ca6351UL, 0x14292967UL,
-	0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, 0x53380d13UL,
-	0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
-	0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL,
-	0xd192e819UL, 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL,
-	0x19a4c116UL, 0x1e376c08UL, 0x2748774cUL, 0x34b0bcb5UL,
-	0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL, 0x682e6ff3UL,
-	0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL,
-	0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
-};
-
-/* Initial hash value H for SHA-256: */
-const static sha2_word32 sha256_initial_hash_value[8] = {
-	0x6a09e667UL,
-	0xbb67ae85UL,
-	0x3c6ef372UL,
-	0xa54ff53aUL,
-	0x510e527fUL,
-	0x9b05688cUL,
-	0x1f83d9abUL,
-	0x5be0cd19UL
-};
-
-/* Hash constant words K for SHA-384 and SHA-512: */
-const static sha2_word64 K512[80] = {
-	0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL,
-	0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
-	0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
-	0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL,
-	0xd807aa98a3030242ULL, 0x12835b0145706fbeULL,
-	0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
-	0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL,
-	0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL,
-	0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
-	0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
-	0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL,
-	0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
-	0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL,
-	0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL,
-	0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
-	0x06ca6351e003826fULL, 0x142929670a0e6e70ULL,
-	0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL,
-	0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
-	0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL,
-	0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
-	0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
-	0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL,
-	0xd192e819d6ef5218ULL, 0xd69906245565a910ULL,
-	0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
-	0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL,
-	0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL,
-	0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
-	0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL,
-	0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL,
-	0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
-	0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL,
-	0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL,
-	0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
-	0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL,
-	0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL,
-	0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
-	0x28db77f523047d84ULL, 0x32caab7b40c72493ULL,
-	0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL,
-	0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
-	0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
-};
-
-/* Initial hash value H for SHA-384 */
-const static sha2_word64 sha384_initial_hash_value[8] = {
-	0xcbbb9d5dc1059ed8ULL,
-	0x629a292a367cd507ULL,
-	0x9159015a3070dd17ULL,
-	0x152fecd8f70e5939ULL,
-	0x67332667ffc00b31ULL,
-	0x8eb44a8768581511ULL,
-	0xdb0c2e0d64f98fa7ULL,
-	0x47b5481dbefa4fa4ULL
-};
-
-/* Initial hash value H for SHA-512 */
-const static sha2_word64 sha512_initial_hash_value[8] = {
-	0x6a09e667f3bcc908ULL,
-	0xbb67ae8584caa73bULL,
-	0x3c6ef372fe94f82bULL,
-	0xa54ff53a5f1d36f1ULL,
-	0x510e527fade682d1ULL,
-	0x9b05688c2b3e6c1fULL,
-	0x1f83d9abfb41bd6bULL,
-	0x5be0cd19137e2179ULL
-};
-
-/*
- * Constant used by SHA256/384/512_End() functions for converting the
- * digest to a readable hexadecimal character string:
- */
-static const char *sha2_hex_digits = "0123456789abcdef";
-
-
-/*** SHA-256: *********************************************************/
-void SHA256_Init(SHA256_CTX* context) {
-	if (context == (SHA256_CTX*)0) {
-		return;
-	}
-	MEMCPY_BCOPY(context->state, sha256_initial_hash_value, SHA256_DIGEST_LENGTH);
-	MEMSET_BZERO(context->buffer, SHA256_BLOCK_LENGTH);
-	context->bitcount = 0;
-}
-
-#ifdef SHA2_UNROLL_TRANSFORM
-
-/* Unrolled SHA-256 round macros: */
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-
-#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h)	\
-	REVERSE32(*data++, W256[j]); \
-	T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
-             K256[j] + W256[j]; \
-	(d) += T1; \
-	(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
-	j++
-
-
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
-
-#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h)	\
-	T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
-	     K256[j] + (W256[j] = *data++); \
-	(d) += T1; \
-	(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
-	j++
-
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
-#define ROUND256(a,b,c,d,e,f,g,h)	\
-	s0 = W256[(j+1)&0x0f]; \
-	s0 = sigma0_256(s0); \
-	s1 = W256[(j+14)&0x0f]; \
-	s1 = sigma1_256(s1); \
-	T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + K256[j] + \
-	     (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0); \
-	(d) += T1; \
-	(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
-	j++
-
-static void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
-	sha2_word32	a, b, c, d, e, f, g, h, s0, s1;
-	sha2_word32	T1, *W256;
-	int		j;
-
-	W256 = (sha2_word32*)context->buffer;
-
-	/* Initialize registers with the prev. intermediate value */
-	a = context->state[0];
-	b = context->state[1];
-	c = context->state[2];
-	d = context->state[3];
-	e = context->state[4];
-	f = context->state[5];
-	g = context->state[6];
-	h = context->state[7];
-
-	j = 0;
-	do {
-		/* Rounds 0 to 15 (unrolled): */
-		ROUND256_0_TO_15(a,b,c,d,e,f,g,h);
-		ROUND256_0_TO_15(h,a,b,c,d,e,f,g);
-		ROUND256_0_TO_15(g,h,a,b,c,d,e,f);
-		ROUND256_0_TO_15(f,g,h,a,b,c,d,e);
-		ROUND256_0_TO_15(e,f,g,h,a,b,c,d);
-		ROUND256_0_TO_15(d,e,f,g,h,a,b,c);
-		ROUND256_0_TO_15(c,d,e,f,g,h,a,b);
-		ROUND256_0_TO_15(b,c,d,e,f,g,h,a);
-	} while (j < 16);
-
-	/* Now for the remaining rounds to 64: */
-	do {
-		ROUND256(a,b,c,d,e,f,g,h);
-		ROUND256(h,a,b,c,d,e,f,g);
-		ROUND256(g,h,a,b,c,d,e,f);
-		ROUND256(f,g,h,a,b,c,d,e);
-		ROUND256(e,f,g,h,a,b,c,d);
-		ROUND256(d,e,f,g,h,a,b,c);
-		ROUND256(c,d,e,f,g,h,a,b);
-		ROUND256(b,c,d,e,f,g,h,a);
-	} while (j < 64);
-
-	/* Compute the current intermediate hash value */
-	context->state[0] += a;
-	context->state[1] += b;
-	context->state[2] += c;
-	context->state[3] += d;
-	context->state[4] += e;
-	context->state[5] += f;
-	context->state[6] += g;
-	context->state[7] += h;
-
-	/* Clean up */
-	a = b = c = d = e = f = g = h = T1 = 0;
-}
-
-#else /* SHA2_UNROLL_TRANSFORM */
-
-static void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
-	sha2_word32	a, b, c, d, e, f, g, h, s0, s1;
-	sha2_word32	T1, T2, *W256;
-	int		j;
-
-	W256 = (sha2_word32*)context->buffer;
-
-	/* Initialize registers with the prev. intermediate value */
-	a = context->state[0];
-	b = context->state[1];
-	c = context->state[2];
-	d = context->state[3];
-	e = context->state[4];
-	f = context->state[5];
-	g = context->state[6];
-	h = context->state[7];
-
-	j = 0;
-	do {
-#if BYTE_ORDER == LITTLE_ENDIAN
-		/* Copy data while converting to host byte order */
-		REVERSE32(*data++,W256[j]);
-		/* Apply the SHA-256 compression function to update a..h */
-		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + W256[j];
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
-		/* Apply the SHA-256 compression function to update a..h with copy */
-		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + (W256[j] = *data++);
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-		T2 = Sigma0_256(a) + Maj(a, b, c);
-		h = g;
-		g = f;
-		f = e;
-		e = d + T1;
-		d = c;
-		c = b;
-		b = a;
-		a = T1 + T2;
-
-		j++;
-	} while (j < 16);
-
-	do {
-		/* Part of the message block expansion: */
-		s0 = W256[(j+1)&0x0f];
-		s0 = sigma0_256(s0);
-		s1 = W256[(j+14)&0x0f];	
-		s1 = sigma1_256(s1);
-
-		/* Apply the SHA-256 compression function to update a..h */
-		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + 
-		     (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0);
-		T2 = Sigma0_256(a) + Maj(a, b, c);
-		h = g;
-		g = f;
-		f = e;
-		e = d + T1;
-		d = c;
-		c = b;
-		b = a;
-		a = T1 + T2;
-
-		j++;
-	} while (j < 64);
-
-	/* Compute the current intermediate hash value */
-	context->state[0] += a;
-	context->state[1] += b;
-	context->state[2] += c;
-	context->state[3] += d;
-	context->state[4] += e;
-	context->state[5] += f;
-	context->state[6] += g;
-	context->state[7] += h;
-
-	/* Clean up */
-	a = b = c = d = e = f = g = h = T1 = T2 = 0;
-}
-
-#endif /* SHA2_UNROLL_TRANSFORM */
-
-void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
-	unsigned int	freespace, usedspace;
-
-	if (len == 0) {
-		/* Calling with no data is valid - we do nothing */
-		return;
-	}
-
-	/* Sanity check: */
-	assert(context != (SHA256_CTX*)0 && data != (sha2_byte*)0);
-
-	usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH;
-	if (usedspace > 0) {
-		/* Calculate how much free space is available in the buffer */
-		freespace = SHA256_BLOCK_LENGTH - usedspace;
-
-		if (len >= freespace) {
-			/* Fill the buffer completely and process it */
-			MEMCPY_BCOPY(&context->buffer[usedspace], data, freespace);
-			context->bitcount += freespace << 3;
-			len -= freespace;
-			data += freespace;
-			SHA256_Transform(context, (sha2_word32*)context->buffer);
-		} else {
-			/* The buffer is not yet full */
-			MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
-			context->bitcount += len << 3;
-			/* Clean up: */
-			usedspace = freespace = 0;
-			return;
-		}
-	}
-	while (len >= SHA256_BLOCK_LENGTH) {
-		/* Process as many complete blocks as we can */
-		sha2_byte buffer[SHA256_BLOCK_LENGTH];
-		MEMCPY_BCOPY(buffer, data, SHA256_BLOCK_LENGTH);
-		SHA256_Transform(context, (sha2_word32*)buffer);
-		context->bitcount += SHA256_BLOCK_LENGTH << 3;
-		len -= SHA256_BLOCK_LENGTH;
-		data += SHA256_BLOCK_LENGTH;
-	}
-	if (len > 0) {
-		/* There's left-overs, so save 'em */
-		MEMCPY_BCOPY(context->buffer, data, len);
-		context->bitcount += len << 3;
-	}
-	/* Clean up: */
-	usedspace = freespace = 0;
-}
-
-void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
-	sha2_word32	*d = (sha2_word32*)digest;
-	unsigned int	usedspace;
-
-	/* Sanity check: */
-	assert(context != (SHA256_CTX*)0);
-
-	/* If no digest buffer is passed, we don't bother doing this: */
-	if (digest != (sha2_byte*)0) {
-		usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH;
-#if BYTE_ORDER == LITTLE_ENDIAN
-		/* Convert FROM host byte order */
-		REVERSE64(context->bitcount,context->bitcount);
-#endif
-		if (usedspace > 0) {
-			/* Begin padding with a 1 bit: */
-			context->buffer[usedspace++] = 0x80;
-
-			if (usedspace <= SHA256_SHORT_BLOCK_LENGTH) {
-				/* Set-up for the last transform: */
-				MEMSET_BZERO(&context->buffer[usedspace], SHA256_SHORT_BLOCK_LENGTH - usedspace);
-			} else {
-				if (usedspace < SHA256_BLOCK_LENGTH) {
-					MEMSET_BZERO(&context->buffer[usedspace], SHA256_BLOCK_LENGTH - usedspace);
-				}
-				/* Do second-to-last transform: */
-				SHA256_Transform(context, (sha2_word32*)context->buffer);
-
-				/* And set-up for the last transform: */
-				MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH);
-			}
-		} else {
-			/* Set-up for the last transform: */
-			MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH);
-
-			/* Begin padding with a 1 bit: */
-			*context->buffer = 0x80;
-		}
-		/* Set the bit count: */
-		union {
-			sha2_byte* c;
-			sha2_word64* l;
-		} bitcount;
-		bitcount.c = &context->buffer[SHA256_SHORT_BLOCK_LENGTH];
-		*(bitcount.l) = context->bitcount;
-
-		/* Final transform: */
-		SHA256_Transform(context, (sha2_word32*)context->buffer);
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-		{
-			/* Convert TO host byte order */
-			int	j;
-			for (j = 0; j < 8; j++) {
-				REVERSE32(context->state[j],context->state[j]);
-				*d++ = context->state[j];
-			}
-		}
-#else
-		MEMCPY_BCOPY(d, context->state, SHA256_DIGEST_LENGTH);
-#endif
-	}
-
-	/* Clean up state data: */
-	MEMSET_BZERO(context, sizeof(*context));
-	usedspace = 0;
-}
-
-char *SHA256_End(SHA256_CTX* context, char buffer[]) {
-	sha2_byte	digest[SHA256_DIGEST_LENGTH], *d = digest;
-	int		i;
-
-	/* Sanity check: */
-	assert(context != (SHA256_CTX*)0);
-
-	if (buffer != (char*)0) {
-		SHA256_Final(digest, context);
-
-		for (i = 0; i < SHA256_DIGEST_LENGTH; i++) {
-			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
-			*buffer++ = sha2_hex_digits[*d & 0x0f];
-			d++;
-		}
-		*buffer = (char)0;
-	} else {
-		MEMSET_BZERO(context, sizeof(*context));
-	}
-	MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH);
-	return buffer;
-}
-
-char* SHA256_Data(const sha2_byte* data, size_t len, char digest[SHA256_DIGEST_STRING_LENGTH]) {
-	SHA256_CTX	context;
-
-	SHA256_Init(&context);
-	SHA256_Update(&context, data, len);
-	return SHA256_End(&context, digest);
-}
-
-
-/*** SHA-512: *********************************************************/
-void SHA512_Init(SHA512_CTX* context) {
-	if (context == (SHA512_CTX*)0) {
-		return;
-	}
-	MEMCPY_BCOPY(context->state, sha512_initial_hash_value, SHA512_DIGEST_LENGTH);
-	MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH);
-	context->bitcount[0] = context->bitcount[1] =  0;
-}
-
-#ifdef SHA2_UNROLL_TRANSFORM
-
-/* Unrolled SHA-512 round macros: */
-#if BYTE_ORDER == LITTLE_ENDIAN
-
-#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h)	\
-	REVERSE64(*data++, W512[j]); \
-	T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
-             K512[j] + W512[j]; \
-	(d) += T1, \
-	(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)), \
-	j++
-
-
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
-
-#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h)	\
-	T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
-             K512[j] + (W512[j] = *data++); \
-	(d) += T1; \
-	(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
-	j++
-
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
-#define ROUND512(a,b,c,d,e,f,g,h)	\
-	s0 = W512[(j+1)&0x0f]; \
-	s0 = sigma0_512(s0); \
-	s1 = W512[(j+14)&0x0f]; \
-	s1 = sigma1_512(s1); \
-	T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + K512[j] + \
-             (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0); \
-	(d) += T1; \
-	(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
-	j++
-
-static void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
-	sha2_word64	a, b, c, d, e, f, g, h, s0, s1;
-	sha2_word64	T1, *W512 = (sha2_word64*)context->buffer;
-	int		j;
-
-	/* Initialize registers with the prev. intermediate value */
-	a = context->state[0];
-	b = context->state[1];
-	c = context->state[2];
-	d = context->state[3];
-	e = context->state[4];
-	f = context->state[5];
-	g = context->state[6];
-	h = context->state[7];
-
-	j = 0;
-	do {
-		ROUND512_0_TO_15(a,b,c,d,e,f,g,h);
-		ROUND512_0_TO_15(h,a,b,c,d,e,f,g);
-		ROUND512_0_TO_15(g,h,a,b,c,d,e,f);
-		ROUND512_0_TO_15(f,g,h,a,b,c,d,e);
-		ROUND512_0_TO_15(e,f,g,h,a,b,c,d);
-		ROUND512_0_TO_15(d,e,f,g,h,a,b,c);
-		ROUND512_0_TO_15(c,d,e,f,g,h,a,b);
-		ROUND512_0_TO_15(b,c,d,e,f,g,h,a);
-	} while (j < 16);
-
-	/* Now for the remaining rounds up to 79: */
-	do {
-		ROUND512(a,b,c,d,e,f,g,h);
-		ROUND512(h,a,b,c,d,e,f,g);
-		ROUND512(g,h,a,b,c,d,e,f);
-		ROUND512(f,g,h,a,b,c,d,e);
-		ROUND512(e,f,g,h,a,b,c,d);
-		ROUND512(d,e,f,g,h,a,b,c);
-		ROUND512(c,d,e,f,g,h,a,b);
-		ROUND512(b,c,d,e,f,g,h,a);
-	} while (j < 80);
-
-	/* Compute the current intermediate hash value */
-	context->state[0] += a;
-	context->state[1] += b;
-	context->state[2] += c;
-	context->state[3] += d;
-	context->state[4] += e;
-	context->state[5] += f;
-	context->state[6] += g;
-	context->state[7] += h;
-
-	/* Clean up */
-	a = b = c = d = e = f = g = h = T1 = 0;
-}
-
-#else /* SHA2_UNROLL_TRANSFORM */
-
-static void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
-	sha2_word64	a, b, c, d, e, f, g, h, s0, s1;
-	sha2_word64	T1, T2, *W512 = (sha2_word64*)context->buffer;
-	int		j;
-
-	/* Initialize registers with the prev. intermediate value */
-	a = context->state[0];
-	b = context->state[1];
-	c = context->state[2];
-	d = context->state[3];
-	e = context->state[4];
-	f = context->state[5];
-	g = context->state[6];
-	h = context->state[7];
-
-	j = 0;
-	do {
-#if BYTE_ORDER == LITTLE_ENDIAN
-		/* Convert TO host byte order */
-		REVERSE64(*data++, W512[j]);
-		/* Apply the SHA-512 compression function to update a..h */
-		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + W512[j];
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
-		/* Apply the SHA-512 compression function to update a..h with copy */
-		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + (W512[j] = *data++);
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-		T2 = Sigma0_512(a) + Maj(a, b, c);
-		h = g;
-		g = f;
-		f = e;
-		e = d + T1;
-		d = c;
-		c = b;
-		b = a;
-		a = T1 + T2;
-
-		j++;
-	} while (j < 16);
-
-	do {
-		/* Part of the message block expansion: */
-		s0 = W512[(j+1)&0x0f];
-		s0 = sigma0_512(s0);
-		s1 = W512[(j+14)&0x0f];
-		s1 =  sigma1_512(s1);
-
-		/* Apply the SHA-512 compression function to update a..h */
-		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] +
-		     (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0);
-		T2 = Sigma0_512(a) + Maj(a, b, c);
-		h = g;
-		g = f;
-		f = e;
-		e = d + T1;
-		d = c;
-		c = b;
-		b = a;
-		a = T1 + T2;
-
-		j++;
-	} while (j < 80);
-
-	/* Compute the current intermediate hash value */
-	context->state[0] += a;
-	context->state[1] += b;
-	context->state[2] += c;
-	context->state[3] += d;
-	context->state[4] += e;
-	context->state[5] += f;
-	context->state[6] += g;
-	context->state[7] += h;
-
-	/* Clean up */
-	a = b = c = d = e = f = g = h = T1 = T2 = 0;
-}
-
-#endif /* SHA2_UNROLL_TRANSFORM */
-
-void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
-	unsigned int	freespace, usedspace;
-
-	if (len == 0) {
-		/* Calling with no data is valid - we do nothing */
-		return;
-	}
-
-	/* Sanity check: */
-	assert(context != (SHA512_CTX*)0 && data != (sha2_byte*)0);
-
-	usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
-	if (usedspace > 0) {
-		/* Calculate how much free space is available in the buffer */
-		freespace = SHA512_BLOCK_LENGTH - usedspace;
-
-		if (len >= freespace) {
-			/* Fill the buffer completely and process it */
-			MEMCPY_BCOPY(&context->buffer[usedspace], data, freespace);
-			ADDINC128(context->bitcount, freespace << 3);
-			len -= freespace;
-			data += freespace;
-			SHA512_Transform(context, (sha2_word64*)context->buffer);
-		} else {
-			/* The buffer is not yet full */
-			MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
-			ADDINC128(context->bitcount, len << 3);
-			/* Clean up: */
-			usedspace = freespace = 0;
-			return;
-		}
-	}
-	while (len >= SHA512_BLOCK_LENGTH) {
-		/* Process as many complete blocks as we can */
-		sha2_byte buffer[SHA512_BLOCK_LENGTH];
-		MEMCPY_BCOPY(buffer, data, SHA512_BLOCK_LENGTH);
-		SHA512_Transform(context, (sha2_word64*)buffer);
-		ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3);
-		len -= SHA512_BLOCK_LENGTH;
-		data += SHA512_BLOCK_LENGTH;
-	}
-	if (len > 0) {
-		/* There's left-overs, so save 'em */
-		MEMCPY_BCOPY(context->buffer, data, len);
-		ADDINC128(context->bitcount, len << 3);
-	}
-	/* Clean up: */
-	usedspace = freespace = 0;
-}
-
-static void SHA512_Last(SHA512_CTX* context) {
-	unsigned int	usedspace;
-
-	usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
-#if BYTE_ORDER == LITTLE_ENDIAN
-	/* Convert FROM host byte order */
-	REVERSE64(context->bitcount[0],context->bitcount[0]);
-	REVERSE64(context->bitcount[1],context->bitcount[1]);
-#endif
-	if (usedspace > 0) {
-		/* Begin padding with a 1 bit: */
-		context->buffer[usedspace++] = 0x80;
-
-		if (usedspace <= SHA512_SHORT_BLOCK_LENGTH) {
-			/* Set-up for the last transform: */
-			MEMSET_BZERO(&context->buffer[usedspace], SHA512_SHORT_BLOCK_LENGTH - usedspace);
-		} else {
-			if (usedspace < SHA512_BLOCK_LENGTH) {
-				MEMSET_BZERO(&context->buffer[usedspace], SHA512_BLOCK_LENGTH - usedspace);
-			}
-			/* Do second-to-last transform: */
-			SHA512_Transform(context, (sha2_word64*)context->buffer);
-
-			/* And set-up for the last transform: */
-			MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH - 2);
-		}
-	} else {
-		/* Prepare for final transform: */
-		MEMSET_BZERO(context->buffer, SHA512_SHORT_BLOCK_LENGTH);
-
-		/* Begin padding with a 1 bit: */
-		*context->buffer = 0x80;
-	}
-	/* Store the length of input data (in bits): */
-	union {
-		sha2_byte* c;
-		sha2_word64* l;
-	} bitcount;
-	bitcount.c = &context->buffer[SHA512_SHORT_BLOCK_LENGTH];
-	bitcount.l[0] = context->bitcount[1];
-	bitcount.l[1] = context->bitcount[0];
-
-	/* Final transform: */
-	SHA512_Transform(context, (sha2_word64*)context->buffer);
-}
-
-void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
-	sha2_word64	*d = (sha2_word64*)digest;
-
-	/* Sanity check: */
-	assert(context != (SHA512_CTX*)0);
-
-	/* If no digest buffer is passed, we don't bother doing this: */
-	if (digest != (sha2_byte*)0) {
-		SHA512_Last(context);
-
-		/* Save the hash data for output: */
-#if BYTE_ORDER == LITTLE_ENDIAN
-		{
-			/* Convert TO host byte order */
-			int	j;
-			for (j = 0; j < 8; j++) {
-				REVERSE64(context->state[j],context->state[j]);
-				*d++ = context->state[j];
-			}
-		}
-#else
-		MEMCPY_BCOPY(d, context->state, SHA512_DIGEST_LENGTH);
-#endif
-	}
-
-	/* Zero out state data */
-	MEMSET_BZERO(context, sizeof(*context));
-}
-
-char *SHA512_End(SHA512_CTX* context, char buffer[]) {
-	sha2_byte	digest[SHA512_DIGEST_LENGTH], *d = digest;
-	int		i;
-
-	/* Sanity check: */
-	assert(context != (SHA512_CTX*)0);
-
-	if (buffer != (char*)0) {
-		SHA512_Final(digest, context);
-
-		for (i = 0; i < SHA512_DIGEST_LENGTH; i++) {
-			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
-			*buffer++ = sha2_hex_digits[*d & 0x0f];
-			d++;
-		}
-		*buffer = (char)0;
-	} else {
-		MEMSET_BZERO(context, sizeof(*context));
-	}
-	MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH);
-	return buffer;
-}
-
-char* SHA512_Data(const sha2_byte* data, size_t len, char digest[SHA512_DIGEST_STRING_LENGTH]) {
-	SHA512_CTX	context;
-
-	SHA512_Init(&context);
-	SHA512_Update(&context, data, len);
-	return SHA512_End(&context, digest);
-}
-
-
-/*** SHA-384: *********************************************************/
-void SHA384_Init(SHA384_CTX* context) {
-	if (context == (SHA384_CTX*)0) {
-		return;
-	}
-	MEMCPY_BCOPY(context->state, sha384_initial_hash_value, SHA512_DIGEST_LENGTH);
-	MEMSET_BZERO(context->buffer, SHA384_BLOCK_LENGTH);
-	context->bitcount[0] = context->bitcount[1] = 0;
-}
-
-void SHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) {
-	SHA512_Update((SHA512_CTX*)context, data, len);
-}
-
-void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
-	sha2_word64	*d = (sha2_word64*)digest;
-
-	/* Sanity check: */
-	assert(context != (SHA384_CTX*)0);
-
-	/* If no digest buffer is passed, we don't bother doing this: */
-	if (digest != (sha2_byte*)0) {
-		SHA512_Last((SHA512_CTX*)context);
-
-		/* Save the hash data for output: */
-#if BYTE_ORDER == LITTLE_ENDIAN
-		{
-			/* Convert TO host byte order */
-			int	j;
-			for (j = 0; j < 6; j++) {
-				REVERSE64(context->state[j],context->state[j]);
-				*d++ = context->state[j];
-			}
-		}
-#else
-		MEMCPY_BCOPY(d, context->state, SHA384_DIGEST_LENGTH);
-#endif
-	}
-
-	/* Zero out state data */
-	MEMSET_BZERO(context, sizeof(*context));
-}
-
-char *SHA384_End(SHA384_CTX* context, char buffer[]) {
-	sha2_byte	digest[SHA384_DIGEST_LENGTH], *d = digest;
-	int		i;
-
-	/* Sanity check: */
-	assert(context != (SHA384_CTX*)0);
-
-	if (buffer != (char*)0) {
-		SHA384_Final(digest, context);
-
-		for (i = 0; i < SHA384_DIGEST_LENGTH; i++) {
-			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
-			*buffer++ = sha2_hex_digits[*d & 0x0f];
-			d++;
-		}
-		*buffer = (char)0;
-	} else {
-		MEMSET_BZERO(context, sizeof(*context));
-	}
-	MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH);
-	return buffer;
-}
-
-char* SHA384_Data(const sha2_byte* data, size_t len, char digest[SHA384_DIGEST_STRING_LENGTH]) {
-	SHA384_CTX	context;
-
-	SHA384_Init(&context);
-	SHA384_Update(&context, data, len);
-	return SHA384_End(&context, digest);
-}
-
diff --git a/apt-pkg/contrib/sha2_internal.h b/apt-pkg/contrib/sha2_internal.h
deleted file mode 100644
index 78d1d3618..000000000
--- a/apt-pkg/contrib/sha2_internal.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * FILE:	sha2.h
- * AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
- * 
- * Copyright (c) 2000-2001, Aaron D. Gifford
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __SHA2_H__
-#define __SHA2_H__
-
-/*
- * Import u_intXX_t size_t type definitions from system headers.  You
- * may need to change this, or define these things yourself in this
- * file.
- */
-#include <sys/types.h>
-
-#ifdef SHA2_USE_INTTYPES_H
-
-#include <inttypes.h>
-#include <stddef.h>
-
-#endif /* SHA2_USE_INTTYPES_H */
-
-
-/*** SHA-256/384/512 Various Length Definitions ***********************/
-#define SHA256_BLOCK_LENGTH		64
-#define SHA256_DIGEST_LENGTH		32
-#define SHA256_DIGEST_STRING_LENGTH	(SHA256_DIGEST_LENGTH * 2 + 1)
-#define SHA384_BLOCK_LENGTH		128
-#define SHA384_DIGEST_LENGTH		48
-#define SHA384_DIGEST_STRING_LENGTH	(SHA384_DIGEST_LENGTH * 2 + 1)
-#define SHA512_BLOCK_LENGTH		128
-#define SHA512_DIGEST_LENGTH		64
-#define SHA512_DIGEST_STRING_LENGTH	(SHA512_DIGEST_LENGTH * 2 + 1)
-
-
-/*** SHA-256/384/512 Context Structures *******************************/
-/* NOTE: If your architecture does not define either u_intXX_t types or
- * uintXX_t (from inttypes.h), you may need to define things by hand
- * for your system:
- */
-#if 0
-typedef unsigned char u_int8_t;		/* 1-byte  (8-bits)  */
-typedef unsigned int u_int32_t;		/* 4-bytes (32-bits) */
-typedef unsigned long long u_int64_t;	/* 8-bytes (64-bits) */
-#endif
-/*
- * Most BSD systems already define u_intXX_t types, as does Linux.
- * Some systems, however, like Compaq's Tru64 Unix instead can use
- * uintXX_t types defined by very recent ANSI C standards and included
- * in the file:
- *
- *   #include <inttypes.h>
- *
- * If you choose to use <inttypes.h> then please define: 
- *
- *   #define SHA2_USE_INTTYPES_H
- *
- * Or on the command line during compile:
- *
- *   cc -DSHA2_USE_INTTYPES_H ...
- */
-#ifdef SHA2_USE_INTTYPES_H
-
-typedef struct _SHA256_CTX {
-	uint32_t	state[8];
-	uint64_t	bitcount;
-	uint8_t	buffer[SHA256_BLOCK_LENGTH];
-} SHA256_CTX;
-typedef struct _SHA512_CTX {
-	uint64_t	state[8];
-	uint64_t	bitcount[2];
-	uint8_t	buffer[SHA512_BLOCK_LENGTH];
-} SHA512_CTX;
-
-#else /* SHA2_USE_INTTYPES_H */
-
-typedef struct _SHA256_CTX {
-	u_int32_t	state[8];
-	u_int64_t	bitcount;
-	u_int8_t	buffer[SHA256_BLOCK_LENGTH];
-} SHA256_CTX;
-typedef struct _SHA512_CTX {
-	u_int64_t	state[8];
-	u_int64_t	bitcount[2];
-	u_int8_t	buffer[SHA512_BLOCK_LENGTH];
-} SHA512_CTX;
-
-#endif /* SHA2_USE_INTTYPES_H */
-
-typedef SHA512_CTX SHA384_CTX;
-
-
-/*** SHA-256/384/512 Function Prototypes ******************************/
-#ifndef NOPROTO
-#ifdef SHA2_USE_INTTYPES_H
-
-void SHA256_Init(SHA256_CTX *);
-void SHA256_Update(SHA256_CTX*, const uint8_t*, size_t);
-void SHA256_Final(uint8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*);
-char* SHA256_End(SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]);
-char* SHA256_Data(const uint8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH]);
-
-void SHA384_Init(SHA384_CTX*);
-void SHA384_Update(SHA384_CTX*, const uint8_t*, size_t);
-void SHA384_Final(uint8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*);
-char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]);
-char* SHA384_Data(const uint8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
-
-void SHA512_Init(SHA512_CTX*);
-void SHA512_Update(SHA512_CTX*, const uint8_t*, size_t);
-void SHA512_Final(uint8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*);
-char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]);
-char* SHA512_Data(const uint8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
-
-#else /* SHA2_USE_INTTYPES_H */
-
-void SHA256_Init(SHA256_CTX *);
-void SHA256_Update(SHA256_CTX*, const u_int8_t*, size_t);
-void SHA256_Final(u_int8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*);
-char* SHA256_End(SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]);
-char* SHA256_Data(const u_int8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH]);
-
-void SHA384_Init(SHA384_CTX*);
-void SHA384_Update(SHA384_CTX*, const u_int8_t*, size_t);
-void SHA384_Final(u_int8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*);
-char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]);
-char* SHA384_Data(const u_int8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
-
-void SHA512_Init(SHA512_CTX*);
-void SHA512_Update(SHA512_CTX*, const u_int8_t*, size_t);
-void SHA512_Final(u_int8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*);
-char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]);
-char* SHA512_Data(const u_int8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
-
-#endif /* SHA2_USE_INTTYPES_H */
-
-#else /* NOPROTO */
-
-void SHA256_Init();
-void SHA256_Update();
-void SHA256_Final();
-char* SHA256_End();
-char* SHA256_Data();
-
-void SHA384_Init();
-void SHA384_Update();
-void SHA384_Final();
-char* SHA384_End();
-char* SHA384_Data();
-
-void SHA512_Init();
-void SHA512_Update();
-void SHA512_Final();
-char* SHA512_End();
-char* SHA512_Data();
-
-#endif /* NOPROTO */
-
-#endif /* __SHA2_H__ */
-
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 738480402..56487b60f 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -83,7 +83,6 @@ std::string TimeRFC1123(time_t Date, bool const NumericTimezone);
  *    parsing is successful, undefined otherwise.
  * @return \b true if parsing was successful, otherwise \b false.
  */
-bool RFC1123StrToTime(const char* const str,time_t &time) APT_MUSTCHECK APT_PKG_590("Replaced by std::string variant");
 bool RFC1123StrToTime(const std::string &str,time_t &time) APT_MUSTCHECK;
 bool FTPMDTMStrToTime(const char* const str,time_t &time) APT_MUSTCHECK;
 std::string LookupTag(const std::string &Message,const char *Tag,const char *Default = 0);