X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=sigcheck.c;h=d0ca3d1965e8a8c8fa3f2254d0b8f5ea3f8364ef;hb=2826e0222d6ad5148384d5d39ea748277093ab21;hp=fc046266248df3d8dd98d6f127758a1c6d163189;hpb=4c8bebffd4bc105ebaa09256b7a57f4a6201bd52;p=onak.git diff --git a/sigcheck.c b/sigcheck.c index fc04626..d0ca3d1 100644 --- a/sigcheck.c +++ b/sigcheck.c @@ -20,6 +20,8 @@ #include #include "config.h" +#include "decodekey.h" +#include "keyid.h" #include "keystructs.h" #include "log.h" #include "openpgp.h" @@ -27,11 +29,13 @@ #ifdef HAVE_NETTLE #include +#include #include #else #include "md5.h" #include "sha1.h" #endif +#include "sha1x.h" int check_packet_sighash(struct openpgp_publickey *key, struct openpgp_packet *packet, @@ -41,7 +45,11 @@ 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; +#endif #ifdef NETTLE_WITH_SHA224 struct sha224_ctx sha224_context; #endif @@ -57,10 +65,12 @@ int check_packet_sighash(struct openpgp_publickey *key, uint8_t keyheader[3]; uint8_t packetheader[5]; uint8_t v4trailer[6]; - uint8_t hash[20]; + uint8_t hash[64]; 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; @@ -100,6 +110,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; @@ -128,6 +170,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; @@ -145,8 +191,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; } @@ -165,6 +213,27 @@ int check_packet_sighash(struct openpgp_publickey *key, } sha1_digest(&sha1_context, 20, hash); break; + case OPENPGP_HASH_RIPEMD160: +#ifdef NETTLE_WITH_RIPEMD160 + ripemd160_init(&ripemd160_context); + for (i = 0; i < chunks; i++) { + ripemd160_update(&ripemd160_context, hashlen[i], + hashdata[i]); + } + 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); @@ -173,10 +242,11 @@ int check_packet_sighash(struct openpgp_publickey *key, hashdata[i]); } sha224_digest(&sha224_context, SHA224_DIGEST_SIZE, hash); + break; #else logthing(LOGTHING_INFO, "SHA224 support not available."); + return -1; #endif - break; case OPENPGP_HASH_SHA256: #ifdef NETTLE_WITH_SHA256 sha256_init(&sha256_context); @@ -185,10 +255,11 @@ int check_packet_sighash(struct openpgp_publickey *key, hashdata[i]); } sha256_digest(&sha256_context, SHA256_DIGEST_SIZE, hash); + break; #else logthing(LOGTHING_INFO, "SHA256 support not available."); + return -1; #endif - break; case OPENPGP_HASH_SHA384: #ifdef NETTLE_WITH_SHA384 sha384_init(&sha384_context); @@ -197,10 +268,11 @@ int check_packet_sighash(struct openpgp_publickey *key, hashdata[i]); } sha384_digest(&sha384_context, SHA384_DIGEST_SIZE, hash); + break; #else logthing(LOGTHING_INFO, "SHA384 support not available."); + return -1; #endif - break; case OPENPGP_HASH_SHA512: #ifdef NETTLE_WITH_SHA512 sha512_init(&sha512_context); @@ -209,18 +281,22 @@ int check_packet_sighash(struct openpgp_publickey *key, hashdata[i]); } sha512_digest(&sha512_context, SHA512_DIGEST_SIZE, hash); + break; #else logthing(LOGTHING_INFO, "SHA512 support not available."); + return -1; #endif - break; 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]);