Replace sha1.cc with boost::uuid::details::sha1

sha1.cc is not redistributable by Debian because the license doesn't
permit redistribution of modified versions.

This isn't ideal since the ::details namespace is subject to change,
but it avoids adding a dependency to ledger.

9 files changed, 20 insertions, 711 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6547f45..9d709338 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,8 +4,8 @@ PROJECT(ledger)
 
 set(Ledger_VERSION_MAJOR 3)
 set(Ledger_VERSION_MINOR 0)
-set(Ledger_VERSION_PATCH 1)
-set(Ledger_VERSION_DATE  20140413)
+set(Ledger_VERSION_PATCH 2)
+set(Ledger_VERSION_DATE  20140417)
 
 enable_testing()
 
diff --git a/default.nix b/default.nix
index db56800f..7a822bbe 100644
--- a/default.nix
+++ b/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchgit, cmake, ninja, boost, gmp, mpfr, libedit, python, texinfo }:
 
 stdenv.mkDerivation {
-  name = "ledger-3.0.1";
-  version = "3.0.1";
+  name = "ledger-3.0.2";
+  version = "3.0.2";
 
   src = ./.;
 
diff --git a/doc/LICENSE-sha1 b/doc/LICENSE-sha1
deleted file mode 100644
index 8d886177..00000000
--- a/doc/LICENSE-sha1
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (C) 1998

-Paul E. Jones <paulej@arid.us>

-All Rights Reserved.

-

-This software is licensed as "freeware."  Permission to distribute

-this software in source and binary forms is hereby granted without

-a fee.  THIS SOFTWARE IS PROVIDED 'AS IS' AND WITHOUT ANY EXPRESSED

-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

-THE AUTHOR SHALL NOT BE HELD LIABLE FOR ANY DAMAGES RESULTING

-FROM THE USE OF THIS SOFTWARE, EITHER DIRECTLY OR INDIRECTLY, INCLUDING,

-BUT NOT LIMITED TO, LOSS OF DATA OR DATA BEING RENDERED INACCURATE.

-

diff --git a/lib/sha1.cpp b/lib/sha1.cpp
deleted file mode 100644
index 1048b157..00000000
--- a/lib/sha1.cpp
+++ /dev/null
@@ -1,589 +0,0 @@
-/*
- *	sha1.cpp
- *
- *	Copyright (C) 1998
- *	Paul E. Jones <paulej@arid.us>
- *	All Rights Reserved.
- *
- *****************************************************************************
- *	$Id: sha1.cpp,v 1.9 2004/03/27 18:02:20 paulej Exp $
- *****************************************************************************
- *
- *	Description:
- * 		This class implements the Secure Hashing Standard as defined
- * 		in FIPS PUB 180-1 published April 17, 1995.
- *
- * 		The Secure Hashing Standard, which uses the Secure Hashing
- * 		Algorithm (SHA), produces a 160-bit message digest for a
- * 		given data stream.  In theory, it is highly improbable that
- * 		two messages will produce the same message digest.  Therefore,
- * 		this algorithm can serve as a means of providing a "fingerprint"
- * 		for a message.
- *
- *	Portability Issues:
- * 		SHA-1 is defined in terms of 32-bit "words".  This code was
- * 		written with the expectation that the processor has at least
- * 		a 32-bit machine word size.  If the machine word size is larger,
- * 		the code should still function properly.  One caveat to that
- *		is that the input functions taking characters and character arrays
- *		assume that only 8 bits of information are stored in each character.
- *
- *	Caveats:
- * 		SHA-1 is designed to work with messages less than 2^64 bits long.
- * 		Although SHA-1 allows a message digest to be generated for
- * 		messages of any number of bits less than 2^64, this implementation
- * 		only works with messages with a length that is a multiple of 8
- * 		bits.
- *
- */
-
-
-#include "sha1.h"
-
-/*	
- *	SHA1
- *
- *	Description:
- *		This is the constructor for the sha1 class.
- *
- *	Parameters:
- *		None.
- *
- *	Returns:
- *		Nothing.
- *
- *	Comments:
- *
- */
-SHA1::SHA1()
-{
-	Reset();
-}
-
-/*	
- *	~SHA1
- *
- *	Description:
- *		This is the destructor for the sha1 class
- *
- *	Parameters:
- *		None.
- *
- *	Returns:
- *		Nothing.
- *
- *	Comments:
- *
- */
-SHA1::~SHA1()
-{
-	// The destructor does nothing
-}
-
-/*	
- *	Reset
- *
- *	Description:
- *		This function will initialize the sha1 class member variables
- *		in preparation for computing a new message digest.
- *
- *	Parameters:
- *		None.
- *
- *	Returns:
- *		Nothing.
- *
- *	Comments:
- *
- */
-void SHA1::Reset()
-{
-	Length_Low			= 0;
-	Length_High			= 0;
-	Message_Block_Index	= 0;
-
-	H[0]		= 0x67452301;
-	H[1]		= 0xEFCDAB89;
-	H[2]		= 0x98BADCFE;
-	H[3]		= 0x10325476;
-	H[4]		= 0xC3D2E1F0;
-
-	Computed	= false;
-	Corrupted	= false;
-}
-
-/*	
- *	Result
- *
- *	Description:
- *		This function will return the 160-bit message digest into the
- *		array provided.
- *
- *	Parameters:
- *		message_digest_array: [out]
- *			This is an array of five unsigned integers which will be filled
- *			with the message digest that has been computed.
- *
- *	Returns:
- *		True if successful, false if it failed.
- *
- *	Comments:
- *
- */
-bool SHA1::Result(unsigned *message_digest_array)
-{
-	int i;									// Counter
-
-	if (Corrupted)
-	{
-		return false;
-	}
-
-	if (!Computed)
-	{
-		PadMessage();
-		Computed = true;
-	}
-
-	for(i = 0; i < 5; i++)
-	{
-		message_digest_array[i] = H[i];
-	}
-
-	return true;
-}
-
-/*	
- *	Input
- *
- *	Description:
- *		This function accepts an array of octets as the next portion of
- *		the message.
- *
- *	Parameters:
- *		message_array: [in]
- *			An array of characters representing the next portion of the
- *			message.
- *
- *	Returns:
- *		Nothing.
- *
- *	Comments:
- *
- */
-void SHA1::Input(	const unsigned char	*message_array,
-					unsigned 			length)
-{
-	if (!length)
-	{
-		return;
-	}
-
-	if (Computed || Corrupted)
-	{
-		Corrupted = true;
-		return;
-	}
-
-	while(length-- && !Corrupted)
-	{
-		Message_Block[Message_Block_Index++] = (*message_array & 0xFF);
-
-		Length_Low += 8;
-		Length_Low &= 0xFFFFFFFF;				// Force it to 32 bits
-		if (Length_Low == 0)
-		{
-			Length_High++;
-			Length_High &= 0xFFFFFFFF;			// Force it to 32 bits
-			if (Length_High == 0)
-			{
-				Corrupted = true;				// Message is too long
-			}
-		}
-
-		if (Message_Block_Index == 64)
-		{
-			ProcessMessageBlock();
-		}
-
-		message_array++;
-	}
-}
-
-/*	
- *	Input
- *
- *	Description:
- *		This function accepts an array of octets as the next portion of
- *		the message.
- *
- *	Parameters:
- *		message_array: [in]
- *			An array of characters representing the next portion of the
- *			message.
- *		length: [in]
- *			The length of the message_array
- *
- *	Returns:
- *		Nothing.
- *
- *	Comments:
- *
- */
-void SHA1::Input(	const char	*message_array,
-					unsigned 	length)
-{
-	Input(reinterpret_cast<unsigned char *>(const_cast<char *>(message_array)), length);
-}
-
-/*	
- *	Input
- *
- *	Description:
- *		This function accepts a single octets as the next message element.
- *
- *	Parameters:
- *		message_element: [in]
- *			The next octet in the message.
- *
- *	Returns:
- *		Nothing.
- *
- *	Comments:
- *
- */
-void SHA1::Input(unsigned char message_element)
-{
-	Input(&message_element, 1);
-}
-
-/*	
- *	Input
- *
- *	Description:
- *		This function accepts a single octet as the next message element.
- *
- *	Parameters:
- *		message_element: [in]
- *			The next octet in the message.
- *
- *	Returns:
- *		Nothing.
- *
- *	Comments:
- *
- */
-void SHA1::Input(char message_element)
-{
-	Input((unsigned char *) &message_element, 1);
-}
-
-/*	
- *	operator<<
- *
- *	Description:
- *		This operator makes it convenient to provide character strings to
- *		the SHA1 object for processing.
- *
- *	Parameters:
- *		message_array: [in]
- *			The character array to take as input.
- *
- *	Returns:
- *		A reference to the SHA1 object.
- *
- *	Comments:
- *		Each character is assumed to hold 8 bits of information.
- *
- */
-SHA1& SHA1::operator<<(const char *message_array)
-{
-	const char *p = message_array;
-
-	while(*p)
-	{
-		Input(*p);
-		p++;
-	}
-
-	return *this;
-}
-
-/*	
- *	operator<<
- *
- *	Description:
- *		This operator makes it convenient to provide character strings to
- *		the SHA1 object for processing.
- *
- *	Parameters:
- *		message_array: [in]
- *			The character array to take as input.
- *
- *	Returns:
- *		A reference to the SHA1 object.
- *
- *	Comments:
- *		Each character is assumed to hold 8 bits of information.
- *
- */
-SHA1& SHA1::operator<<(const unsigned char *message_array)
-{
-	const unsigned char *p = message_array;
-
-	while(*p)
-	{
-		Input(*p);
-		p++;
-	}
-
-	return *this;
-}
-
-/*	
- *	operator<<
- *
- *	Description:
- *		This function provides the next octet in the message.
- *
- *	Parameters:
- *		message_element: [in]
- *			The next octet in the message
- *
- *	Returns:
- *		A reference to the SHA1 object.
- *
- *	Comments:
- *		The character is assumed to hold 8 bits of information.
- *
- */
-SHA1& SHA1::operator<<(const char message_element)
-{
-	Input(reinterpret_cast<unsigned char *>(const_cast<char *>(&message_element)), 1);
-
-	return *this;
-}
-
-/*	
- *	operator<<
- *
- *	Description:
- *		This function provides the next octet in the message.
- *
- *	Parameters:
- *		message_element: [in]
- *			The next octet in the message
- *
- *	Returns:
- *		A reference to the SHA1 object.
- *
- *	Comments:
- *		The character is assumed to hold 8 bits of information.
- *
- */
-SHA1& SHA1::operator<<(const unsigned char message_element)
-{
-	Input(&message_element, 1);
-
-	return *this;
-}
-
-/*	
- *	ProcessMessageBlock
- *
- *	Description:
- *		This function will process the next 512 bits of the message
- *		stored in the Message_Block array.
- *
- *	Parameters:
- *		None.
- *
- *	Returns:
- *		Nothing.
- *
- *	Comments:
- *		Many of the variable names in this function, especially the single
- *	 	character names, were used because those were the names used
- *	  	in the publication.
- *
- */
-void SHA1::ProcessMessageBlock()
-{
-	const unsigned K[] = 	{ 				// Constants defined for SHA-1
-								0x5A827999,
-								0x6ED9EBA1,
-								0x8F1BBCDC,
-								0xCA62C1D6
-							};
-	int 		t;							// Loop counter
-	unsigned 	temp;						// Temporary word value
-	unsigned	W[80];						// Word sequence
-	unsigned	A, B, C, D, E;				// Word buffers
-
-	/*
-	 *	Initialize the first 16 words in the array W
-	 */
-	for(t = 0; t < 16; t++)
-	{
-		W[t] = ((unsigned) Message_Block[t * 4]) << 24;
-		W[t] |= ((unsigned) Message_Block[t * 4 + 1]) << 16;
-		W[t] |= ((unsigned) Message_Block[t * 4 + 2]) << 8;
-		W[t] |= ((unsigned) Message_Block[t * 4 + 3]);
-	}
-
-	for(t = 16; t < 80; t++)
-	{
-	   W[t] = CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]);
-	}
-
-	A = H[0];
-	B = H[1];
-	C = H[2];
-	D = H[3];
-	E = H[4];
-
-	for(t = 0; t < 20; t++)
-	{
-		temp = CircularShift(5,A) + ((B & C) | ((~B) & D)) + E + W[t] + K[0];
-		temp &= 0xFFFFFFFF;
-		E = D;
-		D = C;
-		C = CircularShift(30,B);
-		B = A;
-		A = temp;
-	}
-
-	for(t = 20; t < 40; t++)
-	{
-		temp = CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1];
-		temp &= 0xFFFFFFFF;
-		E = D;
-		D = C;
-		C = CircularShift(30,B);
-		B = A;
-		A = temp;
-	}
-
-	for(t = 40; t < 60; t++)
-	{
-		temp = CircularShift(5,A) +
-		 	   ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2];
-		temp &= 0xFFFFFFFF;
-		E = D;
-		D = C;
-		C = CircularShift(30,B);
-		B = A;
-		A = temp;
-	}
-
-	for(t = 60; t < 80; t++)
-	{
-		temp = CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3];
-		temp &= 0xFFFFFFFF;
-		E = D;
-		D = C;
-		C = CircularShift(30,B);
-		B = A;
-		A = temp;
-	}
-
-	H[0] = (H[0] + A) & 0xFFFFFFFF;
-	H[1] = (H[1] + B) & 0xFFFFFFFF;
-	H[2] = (H[2] + C) & 0xFFFFFFFF;
-	H[3] = (H[3] + D) & 0xFFFFFFFF;
-	H[4] = (H[4] + E) & 0xFFFFFFFF;
-
-	Message_Block_Index = 0;
-}
-
-/*	
- *	PadMessage
- *
- *	Description:
- *		According to the standard, the message must be padded to an even
- *		512 bits.  The first padding bit must be a '1'.  The last 64 bits
- *		represent the length of the original message.  All bits in between
- *		should be 0.  This function will pad the message according to those
- *		rules by filling the message_block array accordingly.  It will also
- *		call ProcessMessageBlock() appropriately.  When it returns, it
- *		can be assumed that the message digest has been computed.
- *
- *	Parameters:
- *		None.
- *
- *	Returns:
- *		Nothing.
- *
- *	Comments:
- *
- */
-void SHA1::PadMessage()
-{
-	/*
-	 *	Check to see if the current message block is too small to hold
-	 *	the initial padding bits and length.  If so, we will pad the
-	 *	block, process it, and then continue padding into a second block.
-	 */
-	if (Message_Block_Index > 55)
-	{
-		Message_Block[Message_Block_Index++] = 0x80;
-		while(Message_Block_Index < 64)
-		{
-			Message_Block[Message_Block_Index++] = 0;
-		}
-
-		ProcessMessageBlock();
-
-		while(Message_Block_Index < 56)
-		{
-			Message_Block[Message_Block_Index++] = 0;
-		}
-	}
-	else
-	{
-		Message_Block[Message_Block_Index++] = 0x80;
-		while(Message_Block_Index < 56)
-		{
-			Message_Block[Message_Block_Index++] = 0;
-		}
-
-	}
-
-	/*
-	 *	Store the message length as the last 8 octets
-	 */
-	Message_Block[56] = static_cast<unsigned char>((Length_High >> 24) & 0xFF);
-	Message_Block[57] = static_cast<unsigned char>((Length_High >> 16) & 0xFF);
-	Message_Block[58] = static_cast<unsigned char>((Length_High >> 8) & 0xFF);
-	Message_Block[59] = static_cast<unsigned char>((Length_High) & 0xFF);
-	Message_Block[60] = static_cast<unsigned char>((Length_Low >> 24) & 0xFF);
-	Message_Block[61] = static_cast<unsigned char>((Length_Low >> 16) & 0xFF);
-	Message_Block[62] = static_cast<unsigned char>((Length_Low >> 8) & 0xFF);
-	Message_Block[63] = static_cast<unsigned char>((Length_Low) & 0xFF);
-
-	ProcessMessageBlock();
-}
-
-
-/*	
- *	CircularShift
- *
- *	Description:
- *		This member function will perform a circular shifting operation.
- *
- *	Parameters:
- *		bits: [in]
- *			The number of bits to shift (1-31)
- *		word: [in]
- *			The value to shift (assumes a 32-bit integer)
- *
- *	Returns:
- *		The shifted value.
- *
- *	Comments:
- *
- */
-unsigned SHA1::CircularShift(int bits, unsigned word)
-{
-	return ((word << bits) & 0xFFFFFFFF) | ((word & 0xFFFFFFFF) >> (32-bits));
-}
diff --git a/lib/sha1.h b/lib/sha1.h
deleted file mode 100644
index 0a12d0f3..00000000
--- a/lib/sha1.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *	sha1.h
- *
- *	Copyright (C) 1998
- *	Paul E. Jones <paulej@arid.us>
- *	All Rights Reserved.
- *
- *****************************************************************************
- *	$Id: sha1.h,v 1.6 2004/03/27 18:02:26 paulej Exp $
- *****************************************************************************
- *
- *	Description:
- * 		This class implements the Secure Hashing Standard as defined
- * 		in FIPS PUB 180-1 published April 17, 1995.
- *
- *		Many of the variable names in this class, especially the single
- *		character names, were used because those were the names used
- *		in the publication.
- *
- * 		Please read the file sha1.cpp for more information.
- *
- */
-
-#ifndef _SHA1_H_
-#define _SHA1_H_
-
-class SHA1
-{
-
-	public:
-
-		SHA1();
-		virtual ~SHA1();
-
-		/*
-		 *	Re-initialize the class
-		 */
-		void Reset();
-
-		/*
-		 *	Returns the message digest
-		 */
-		bool Result(unsigned *message_digest_array);
-
-		/*
-		 *	Provide input to SHA1
-		 */
-		void Input(	const unsigned char	*message_array,
-					unsigned			length);
-		void Input(	const char	*message_array,
-					unsigned	length);
-		void Input(unsigned char message_element);
-		void Input(char message_element);
-		SHA1& operator<<(const char *message_array);
-		SHA1& operator<<(const unsigned char *message_array);
-		SHA1& operator<<(const char message_element);
-		SHA1& operator<<(const unsigned char message_element);
-
-	private:
-
-		/*
-		 *	Process the next 512 bits of the message
-		 */
-		void ProcessMessageBlock();
-
-		/*
-		 *	Pads the current message block to 512 bits
-		 */
-		void PadMessage();
-
-		/*
-		 *	Performs a circular left shift operation
-		 */
-		inline unsigned CircularShift(int bits, unsigned word);
-
-		unsigned H[5];						// Message digest buffers
-
-		unsigned Length_Low;				// Message length in bits
-		unsigned Length_High;				// Message length in bits
-
-		unsigned char Message_Block[64];	// 512-bit message blocks
-		int Message_Block_Index;			// Index into message block array
-
-		bool Computed;						// Is the digest computed?
-		bool Corrupted;						// Is the message digest corruped?
-	
-};
-
-#endif
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6304a50c..a77422db 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -254,7 +254,7 @@ include(GNUInstallDirs)
 
 if(BUILD_LIBRARY)
   set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-  add_library(libledger SHARED ${LEDGER_SOURCES} ${PROJECT_SOURCE_DIR}/lib/sha1.cpp)
+  add_library(libledger SHARED ${LEDGER_SOURCES})
   add_ledger_library_dependencies(libledger)
   set_target_properties(libledger PROPERTIES
     PREFIX ""
@@ -267,11 +267,9 @@ if(BUILD_LIBRARY)
 
   install(TARGETS libledger DESTINATION ${CMAKE_INSTALL_LIBDIR})
   install(FILES ${LEDGER_INCLUDES}
-    ${PROJECT_SOURCE_DIR}/lib/sha1.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ledger)
 else()
-  add_executable(ledger
-    ${LEDGER_SOURCES} ${PROJECT_SOURCE_DIR}/lib/sha1.cpp main.cc global.cc)
+  add_executable(ledger ${LEDGER_SOURCES} main.cc global.cc)
   add_ledger_library_dependencies(ledger)
 endif()
 
diff --git a/src/filters.cc b/src/filters.cc
index 4046ebda..bdc2983b 100644
--- a/src/filters.cc
+++ b/src/filters.cc
@@ -237,7 +237,7 @@ void anonymize_posts::render_commodity(amount_t& amt)
 
 void anonymize_posts::operator()(post_t& post)
 {
-  SHA1         sha;
+	boost::uuids::detail::sha1  sha;
   unsigned int message_digest[5];
   bool         copy_xact_details = false;
 
@@ -256,9 +256,9 @@ void anonymize_posts::operator()(post_t& post)
     buf << reinterpret_cast<uintmax_t>(post.xact->payee.c_str())
         << integer_gen() << post.xact->payee.c_str();
 
-    sha.Reset();
-    sha << buf.str().c_str();
-    sha.Result(message_digest);
+		sha.reset();
+    sha.process_bytes(buf.str().c_str(), buf.str().length());
+    sha.get_digest(message_digest);
 
     xact.payee = to_hex(message_digest);
     xact.note  = none;
@@ -274,9 +274,9 @@ void anonymize_posts::operator()(post_t& post)
     std::ostringstream buf;
     buf << integer_gen() << acct << acct->fullname();
 
-    sha.Reset();
-    sha << buf.str().c_str();
-    sha.Result(message_digest);
+    sha.reset();
+    sha.process_bytes(buf.str().c_str(), buf.str().length());
+    sha.get_digest(message_digest);
 
     account_names.push_front(to_hex(message_digest));
   }
diff --git a/src/system.hh.in b/src/system.hh.in
index fd5c47c6..952411f9 100644
--- a/src/system.hh.in
+++ b/src/system.hh.in
@@ -160,7 +160,6 @@ typedef std::ostream::pos_type ostream_pos_type;
 
 #include <gmp.h>
 #include <mpfr.h>
-#include "sha1.h"
 #include "utf8.h"
 
 #if HAVE_EDIT
diff --git a/src/utils.h b/src/utils.h
index 70b3bae9..95cc64fd 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -44,6 +44,8 @@
 #ifndef _UTILS_H
 #define _UTILS_H
 
+#include <boost/uuid/sha1.hpp>
+
 /**
  * @name Default values
  */
@@ -625,11 +627,12 @@ inline string to_hex(unsigned int * message_digest, const int len = 1)
 
 inline string sha1sum(const string& str)
 {
-  SHA1 sha;
-  sha.Reset();
-  sha << str.c_str();
+	boost::uuids::detail::sha1 sha;
+
+  sha.process_bytes(str.c_str(), str.length());
+
   unsigned int message_digest[5];
-  sha.Result(message_digest);
+  sha.get_digest(message_digest);
   return to_hex(message_digest, 5);
 }