Merge pull request trusteddomainproject#168 from simplelists/hashtype…

…_parse

Fix verification when key specifies hash algorithm

If an ARC key specifies the hash type as SHA256 (i.e. h=sha256) then
OpenARC will fail to verify the signature. Whilst the presence of a
particular hash type is detected, the type is not set and it defaults
to sha1.

trusteddomainproject#168

libopenarc/arc.c

@@ -289,6 +289,57 @@ arc_key_hashesok(ARC_LIB *lib, u_char *hashlist)
 	/* NOTREACHED */
 }
 
+/*
+**  ARC_PARSE_ALGORITHM -- parse an algorithm and set the msg hash and key,
+**				  as well as set the message digest algorithm for
+**				  RSA_verify in the variable nid
+**
+**  Parameters:
+**  	msg -- ARC_MESSAGE handle
+**  	alg -- string containing the algorithm to parse
+**  	nid -- variable to write the message digest algorithm
+**
+**  Return value:
+**  	An ARC_STAT_* constant.
+*/
+
+ARC_STAT
+arc_parse_algorithm(ARC_MESSAGE *msg, u_char *alg, int *nid)
+{
+	arc_alg_t algtype;
+
+	assert(msg != NULL);
+	assert(nid != NULL);
+
+	if (alg == NULL)
+	{
+		arc_error(msg, "missing algorithm passed to arc_parse_algorithm");
+		return ARC_STAT_BADALG;
+	}
+
+	algtype = arc_name_to_code(algorithms, alg);
+
+	if (algtype == ARC_SIGN_RSASHA1)
+	{
+		msg->arc_hashtype = ARC_HASHTYPE_SHA1;
+		msg->arc_keytype = ARC_KEYTYPE_RSA;
+		*nid = NID_sha1;
+	}
+	else if (algtype == ARC_SIGN_RSASHA256)
+	{
+		msg->arc_hashtype = ARC_HASHTYPE_SHA256;
+		msg->arc_keytype = ARC_KEYTYPE_RSA;
+		*nid = NID_sha256;
+	}
+	else
+	{
+		arc_error(msg, "unknown or invalid algorithm: %s", alg);
+		return ARC_STAT_BADALG;
+	}
+
+	return ARC_STAT_OK;
+}
+
 /*
 **  ARC_GENAMSHDR -- generate a signature or seal header field
 **
@@ -1964,6 +2015,13 @@ arc_validate_msg(ARC_MESSAGE *msg, u_int setnum)
 	msg->arc_selector = arc_param_get(kvset, "s");
 	msg->arc_domain = arc_param_get(kvset, "d");
 
+	/* store algorithm in msg, needed for arc_get_key() */
+	alg = arc_param_get(kvset, "a");
+	status = arc_parse_algorithm(msg, alg, &nid);
+	if (status != ARC_STAT_OK)
+            // arc_error already set by arc_parse_algorithm()
+            return status;
+
 	/* get the key from DNS (or wherever) */
 	status = arc_get_key(msg, FALSE);
 	if (status != ARC_STAT_OK)
@@ -2038,11 +2096,6 @@ arc_validate_msg(ARC_MESSAGE *msg, u_int setnum)
 		return ARC_STAT_CANTVRFY;
 	}
 
-	alg = arc_param_get(kvset, "a");
-	nid = NID_sha1;
-	if (alg != NULL && strcmp(alg, "rsa-sha256") == 0)
-		nid = NID_sha256;
-
 	rsastat = RSA_verify(nid, hh, hhlen, sig, siglen, rsa);
 
 	RSA_free(rsa);
@@ -2118,6 +2171,13 @@ arc_validate_seal(ARC_MESSAGE *msg, u_int setnum)
 	msg->arc_selector = arc_param_get(kvset, "s");
 	msg->arc_domain = arc_param_get(kvset, "d");
 
+	/* store algorithm in msg, needed for arc_get_key() */
+	alg = arc_param_get(kvset, "a");
+	status = arc_parse_algorithm(msg, alg, &nid);
+	if (status != ARC_STAT_OK)
+            // arc_error already set by arc_parse_algorithm()
+            return status;
+
 	if (msg->arc_selector == NULL)
 	{
 		arc_error(msg, "seal at i=%u has no selector", setnum);
@@ -2190,11 +2250,6 @@ arc_validate_seal(ARC_MESSAGE *msg, u_int setnum)
 		return ARC_STAT_INTERNAL;
 	}
 
-	alg = arc_param_get(kvset, "a");
-	nid = NID_sha1;
-	if (alg != NULL && strcmp(alg, "rsa-sha256") == 0)
-		nid = NID_sha256;
-
 	rsastat = RSA_verify(nid, sh, shlen, sig, siglen, rsa);
 
 	RSA_free(rsa);

libopenarc/arc.h

@@ -81,6 +81,7 @@ typedef int ARC_STAT;
 #define	ARC_STAT_KEYFAIL	11	/* key retrieval failed */
 #define	ARC_STAT_MULTIDNSREPLY	12	/* multiple DNS replies */
 #define	ARC_STAT_SIGGEN		13	/* seal generation failed */
+#define	ARC_STAT_BADALG		14	/* unknown or invalid algorithm */
 
 /*
 **  ARC_CHAIN -- chain state