#include <stdint.h>
#include "config.h"
+#include "decodekey.h"
#include "keyid.h"
#include "keystructs.h"
#include "log.h"
#include "md5.h"
#include "sha1.h"
#endif
+#include "sha1x.h"
int check_packet_sighash(struct openpgp_publickey *key,
struct openpgp_packet *packet,
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;
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;
+ len = parse_subpackets(&sig->data[4], &keyid, NULL);
+ 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;
}
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);
}
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]);