X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=sigcheck.c;h=2401665b498bbfaf78c4662a55dcb0bf407bcb91;hb=3512fa56e404e5dc2e3a6a3ca6fa23eb25760493;hp=a0f4feb2d6bada946f8eaf2f73088e64d997f8e6;hpb=a8eae82dbcc70ecb4380cf6393c6b594b9abe995;p=onak.git

diff --git a/sigcheck.c b/sigcheck.c
index a0f4feb..2401665 100644
--- a/sigcheck.c
+++ b/sigcheck.c
@@ -13,13 +13,14 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <stdint.h>
 
-#include "config.h"
+#include "build-config.h"
+#include "decodekey.h"
+#include "keyid.h"
 #include "keystructs.h"
 #include "log.h"
 #include "openpgp.h"
@@ -33,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,
@@ -42,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;
@@ -65,6 +68,8 @@ int check_packet_sighash(struct openpgp_publickey *key,
 	uint8_t *hashdata[8];
 	size_t hashlen[8];
 	int chunks, i;
+	uint64_t keyid;
+	onak_status_t res;
 
 	keyheader[0] = 0x99;
 	keyheader[1] = key->publickey->length >> 8;
@@ -104,6 +109,38 @@ int check_packet_sighash(struct openpgp_publickey *key,
 	case 4:
 		hashtype = sig->data[3];
 
+		/* Check to see if this is an X509 based signature */
+		if (sig->data[2] == 0 || sig->data[2] == 100) {
+			size_t len;
+
+			keyid = 0;
+			res = parse_subpackets(&sig->data[4],
+						sig->length - 4, &len,
+						&keyid, NULL);
+			if (res != ONAK_E_OK) {
+				/* If it parses badly, reject it */
+				return 0;
+			}
+			if (keyid == 0 &&
+					/* No unhashed data */
+					sig->data[4 + len] == 0 &&
+					sig->data[5 + len] == 0 &&
+					/* Dummy 0 checksum */
+					sig->data[6 + len] == 0 &&
+					sig->data[7 + len] == 0 &&
+					/* Dummy MPI of 1 */
+					sig->data[8 + len] == 0 &&
+					sig->data[9 + len] == 1 &&
+					sig->data[10 + len] == 1) {
+				get_keyid(key, &keyid);
+				logthing(LOGTHING_DEBUG,
+					"Skipping X509 signature on 0x%016"
+					PRIX64,
+					keyid);
+				return -1;
+			}
+		}
+
 		if (packet != NULL) {
 			if (packet->tag == OPENPGP_PACKET_PUBLICSUBKEY) {
 				packetheader[0] = 0x99;
@@ -132,6 +169,10 @@ int check_packet_sighash(struct openpgp_publickey *key,
 		hashdata[chunks] = sig->data;
 		hashlen[chunks] = siglen = (sig->data[4] << 8) +
 			sig->data[5] + 6;;
+		if (siglen > sig->length) {
+			/* Signature data exceed packet length, bogus */
+			return 0;
+		}
 		chunks++;
 
 		v4trailer[0] = 4;
@@ -149,8 +190,10 @@ int check_packet_sighash(struct openpgp_publickey *key,
 		sighash = &sig->data[siglen + unhashedlen + 2];
 		break;
 	default:
-		logthing(LOGTHING_ERROR, "Unknown signature version %d",
-				sig->data[0]);
+		get_keyid(key, &keyid);
+		logthing(LOGTHING_ERROR,
+			"Unknown signature version %d on 0x%016" PRIX64,
+			sig->data[0], keyid);
 		return -1;
 	}
 
@@ -178,10 +221,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);
@@ -235,13 +286,16 @@ int check_packet_sighash(struct openpgp_publickey *key,
 		return -1;
 #endif
 	default:
-		logthing(LOGTHING_ERROR, "Unsupported signature hash type %d",
-				hashtype);
+		get_keyid(key, &keyid);
+		logthing(LOGTHING_ERROR,
+			"Unsupported signature hash type %d on 0x%016" PRIX64,
+			hashtype,
+			keyid);
 		return -1;
 	}
 
 	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]);