sha_hash: use crypto++ lib instead of bundled one

autogen.sh

@@ -28,7 +28,7 @@ echo "${NAME}_CPPFLAGS = -I\$(srcdir)/$i/ ${COMMON_CPPFLAGS}" >>$OUT
 echo "${NAME}_CFLAGS = ${COMMON_CFLAGS}" >>$OUT
 echo "${NAME}_CXXFLAGS = ${COMMON_CXXFLAGS}" >>$OUT
 echo "${NAME}_LDFLAGS = ${COMMON_LDFLAGS}" >>$OUT
-echo "${NAME}_LDADD = -lgmp ${COMMON_LDADD} " >>$OUT
+echo "${NAME}_LDADD = -lgmp -lcrypto++ ${COMMON_LDADD} " >>$OUT
 
 libtoolize --force && aclocal && autoconf && automake --add-missing
 

src/keyring.cpp

@@ -29,24 +29,25 @@ void keyring::clear()
  * simple fingerprint.
  */
 
-#include "sha2.h"
+#include <crypto++/sha.h>
 #include <inttypes.h>
 
 std::string keyring::get_keyid (const std::string&pubkey)
 {
-	SHA256_CTX ctx;
+	static const char hex[] = "0123456789abcdef";
-	uint8_t t;
-
-	SHA256_Init (&ctx);
-
-	for (size_t i = 0; i < pubkey.length(); ++i) {
-		t = pubkey[i];
-		SHA256_Update (&ctx, &t, 1);
-	}
 
 	std::string r;
-	r.resize (64, ' ');
+	std::vector<byte> tmp;
-	SHA256_End (&ctx, & (r[0]) );
+
+	tmp.resize (CryptoPP::SHA256::DIGESTSIZE, 0);
+	CryptoPP::SHA256().CalculateDigest ( & (tmp[0]),
+	                                     (const byte*) & (pubkey[0]),
+	                                     pubkey.length() );
+	r.resize (tmp.size() * 2, ' ');
+	for (size_t i = 0; i < tmp.size(); ++i) {
+		r[2 * i] = hex[ (tmp[i] >> 4) & 0xf];
+		r[2 * i + 1] = hex[tmp[i] & 0xf];
+	}
 
 	return r;
 }

src/sha2.h

@@ -1,197 +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.
- *
- * $Id: sha2.h,v 1.1 2001/11/08 00:02:01 adg Exp adg $
- */
-
-#ifndef __SHA2_H__
-#define __SHA2_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*
- * 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>
-
-#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 */
-
-#ifdef	__cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __SHA2_H__ */
-

src/sha_hash.h

@@ -20,23 +20,23 @@
 #define _ccr_sha_hash_h_
 
 #include "hash.h"
-#include "sha2.h"
+
+#include <crypto++/sha.h>
 #include <inttypes.h>
 
 class sha256hash : public hash_func
 {
 public:
 	uint size() {
-		return SHA256_DIGEST_LENGTH;
+		return CryptoPP::SHA256::DIGESTSIZE;
 	}
 
 	std::vector<byte> operator() (const std::vector<byte>&a) {
-		SHA256_CTX ctx;
-		SHA256_Init (&ctx);
-		SHA256_Update (&ctx, (const uint8_t*) & (a[0]), a.size() );
 		std::vector<byte> r;
 		r.resize (size() );
-		SHA256_Final ( (uint8_t*) & (r[0]), &ctx);
+		CryptoPP::SHA256().CalculateDigest (& (r[0]),
+		                                    & (a[0]),
+		                                    a.size() );
 		return r;
 	}
 };
@@ -45,16 +45,15 @@ class sha384hash : public hash_func
 {
 public:
 	uint size() {
-		return SHA384_DIGEST_LENGTH;
+		return CryptoPP::SHA384::DIGESTSIZE;
 	}
 
 	std::vector<byte> operator() (const std::vector<byte>&a) {
-		SHA384_CTX ctx;
-		SHA384_Init (&ctx);
-		SHA384_Update (&ctx, (const uint8_t*) & (a[0]), a.size() );
 		std::vector<byte> r;
 		r.resize (size() );
-		SHA384_Final ( (uint8_t*) & (r[0]), &ctx);
+		CryptoPP::SHA384().CalculateDigest (& (r[0]),
+		                                    & (a[0]),
+		                                    a.size() );
 		return r;
 	}
 };
@@ -63,19 +62,17 @@ class sha512hash : public hash_func
 {
 public:
 	uint size() {
-		return SHA512_DIGEST_LENGTH;
+		return CryptoPP::SHA512::DIGESTSIZE;
 	}
 
 	std::vector<byte> operator() (const std::vector<byte>&a) {
-		SHA512_CTX ctx;
-		SHA512_Init (&ctx);
-		SHA512_Update (&ctx, (const uint8_t*) & (a[0]), a.size() );
 		std::vector<byte> r;
 		r.resize (size() );
-		SHA512_Final ( (uint8_t*) & (r[0]), &ctx);
+		CryptoPP::SHA512().CalculateDigest (& (r[0]),
+		                                    & (a[0]),
+		                                    a.size() );
 		return r;
 	}
 };
 
-
 #endif