X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=sigcheck.c;h=900d3514fab414bd30ee85580b58a5c7108c9067;hb=7f6a0a82eafb84548e5a298485533a2fd506f98d;hp=2f165bce0dd1e711bff108089ecc70781ca33595;hpb=8574412dcf649de37289721ec216215a79fbcd14;p=onak.git

diff --git a/sigcheck.c b/sigcheck.c
index 2f165bc..900d351 100644
--- a/sigcheck.c
+++ b/sigcheck.c
@@ -34,6 +34,7 @@
 #include "md5.h"
 #include "sha1.h"
 #endif
+#include "sha1x.h"
 
 int check_packet_sighash(struct openpgp_publickey *key,
 			struct openpgp_packet *packet,
@@ -43,6 +44,7 @@ int check_packet_sighash(struct openpgp_publickey *key,
 	uint8_t *sighash;
 	size_t siglen, unhashedlen;
 	struct sha1_ctx sha1_context;
+	struct sha1x_ctx sha1x_context;
 	struct md5_ctx md5_context;
 #ifdef NETTLE_WITH_RIPEMD160
 	struct ripemd160_ctx ripemd160_context;
@@ -182,10 +184,18 @@ int check_packet_sighash(struct openpgp_publickey *key,
 		}
 		ripemd160_digest(&ripemd160_context, RIPEMD160_DIGEST_SIZE,
 			hash);
+		break;
 #else
 		logthing(LOGTHING_INFO, "RIPEMD160 support not available.");
 		return -1;
 #endif
+	case OPENPGP_HASH_SHA1X:
+		sha1x_init(&sha1x_context);
+		for (i = 0; i < chunks; i++) {
+			sha1x_update(&sha1x_context, hashlen[i], hashdata[i]);
+		}
+		sha1x_digest(&sha1x_context, 20, hash);
+		break;
 	case OPENPGP_HASH_SHA224:
 #ifdef NETTLE_WITH_SHA224
 		sha224_init(&sha224_context);
@@ -248,7 +258,7 @@ int check_packet_sighash(struct openpgp_publickey *key,
 	}
 
 	logthing(LOGTHING_DEBUG, "Hash type: %d, %d chunks, "
-		"calculated: %02X%02X / actual: %02X%02X\n",
+		"calculated: %02X%02X / actual: %02X%02X",
 		hashtype, chunks,
 		hash[0], hash[1], sighash[0], sighash[1]);