#include "keyid.h"
#include "keystructs.h"
+#include "log.h"
#include "md5.h"
-#include "sha.h"
+#include "sha1.h"
+
/**
* get_keyid - Given a public key returns the keyid.
- * @publickey: The key to calculate the fingerprint for.
+ * @publickey: The key to calculate the id for.
*/
uint64_t get_keyid(struct openpgp_publickey *publickey)
{
- SHA1_CONTEXT sha_ctx;
- uint64_t keyid = 0;
- int offset = 0;
- int i = 0;
+ return (get_packetid(publickey->publickey));
+}
+
+/**
+ * get_fingerprint - Given a public key returns the fingerprint.
+ * @publickey: The key to calculate the id for.
+ * @fingerprint: The fingerprint (must be at least 20 bytes of space).
+ * @len: The length of the returned fingerprint.
+ *
+ * This function returns the fingerprint for a given public key. As Type 3
+ * fingerprints are 16 bytes and Type 4 are 20 the len field indicates
+ * which we've returned.
+ */
+unsigned char *get_fingerprint(struct openpgp_packet *packet,
+ unsigned char *fingerprint,
+ size_t *len)
+{
+ SHA1_CTX sha_ctx;
+ struct md5_ctx md5_context;
unsigned char c;
- unsigned char *buff = NULL;
+ size_t modlen, explen;
+
+ log_assert(fingerprint != NULL);
+ log_assert(len != NULL);
+
+ *len = 0;
- switch (publickey->publickey->data[0]) {
+ switch (packet->data[0]) {
case 2:
case 3:
+ md5_init_ctx(&md5_context);
+
/*
- * For a type 2 or 3 key the keyid is the last 64 bits of the
- * public modulus n, which is stored as an MPI from offset 8
- * onwards.
- *
- * We need to ensure it's an RSA key.
+ * MD5 the modulus and exponent.
*/
- if (publickey->publickey->data[7] == 1) {
- offset = (publickey->publickey->data[8] << 8) +
- publickey->publickey->data[9];
- offset = ((offset + 7) / 8) + 2;
-
- for (keyid = 0, i = 0; i < 8; i++) {
- keyid <<= 8;
- keyid += publickey->publickey->data[offset++];
- }
- } else {
- fputs("Type 2 or 3 key, but not RSA.\n", stderr);
- }
+ modlen = ((packet->data[8] << 8) +
+ packet->data[9] + 7) >> 3;
+ md5_process_bytes(&packet->data[10], modlen, &md5_context);
+
+ explen = ((packet->data[10+modlen] << 8) +
+ packet->data[11+modlen] + 7) >> 3;
+ md5_process_bytes(&packet->data[12 + modlen], explen,
+ &md5_context);
+
+ md5_finish_ctx(&md5_context, fingerprint);
+ *len = 16;
+
break;
+
case 4:
- /*
- * For a type 4 key the keyid is the last 64 bits of the
- * fingerprint, which is the 160 bit SHA-1 hash of the packet
- * tag, 2 octet packet length and the public key packet
- * including version field.
- */
- sha1_init(&sha_ctx);
+ SHA1Init(&sha_ctx);
/*
* TODO: Can this be 0x99? Are all public key packets old
* format with 2 bytes of length data?
*/
c = 0x99;
- sha1_write(&sha_ctx, &c, sizeof(c));
- c = publickey->publickey->length >> 8;
- sha1_write(&sha_ctx, &c, sizeof(c));
- c = publickey->publickey->length & 0xFF;
- sha1_write(&sha_ctx, &c, sizeof(c));
- sha1_write(&sha_ctx, publickey->publickey->data,
- publickey->publickey->length);
- sha1_final(&sha_ctx);
- buff = sha1_read(&sha_ctx);
-
- assert(buff != NULL);
+ SHA1Update(&sha_ctx, &c, sizeof(c));
+ c = packet->length >> 8;
+ SHA1Update(&sha_ctx, &c, sizeof(c));
+ c = packet->length & 0xFF;
+ SHA1Update(&sha_ctx, &c, sizeof(c));
+ SHA1Update(&sha_ctx, packet->data,
+ packet->length);
+ SHA1Final(fingerprint, &sha_ctx);
+ *len = 20;
+
+ break;
+ default:
+ logthing(LOGTHING_ERROR, "Unknown key type: %d",
+ packet->data[0]);
+ }
+
+ return fingerprint;
+}
+
+
+/**
+ * get_packetid - Given a PGP packet returns the keyid.
+ * @packet: The packet to calculate the id for.
+ */
+uint64_t get_packetid(struct openpgp_packet *packet)
+{
+ uint64_t keyid = 0;
+ int offset = 0;
+ int i = 0;
+ size_t length = 0;
+ unsigned char buff[20];
+
+ log_assert(packet != NULL);
+
+ switch (packet->data[0]) {
+ case 2:
+ case 3:
+ /*
+ * For a type 2 or 3 key the keyid is the last 64 bits of the
+ * public modulus n, which is stored as an MPI from offset 8
+ * onwards.
+ */
+ offset = (packet->data[8] << 8) +
+ packet->data[9];
+ offset = ((offset + 7) / 8) + 2;
+
+ for (keyid = 0, i = 0; i < 8; i++) {
+ keyid <<= 8;
+ keyid += packet->data[offset++];
+ }
+ /*
+ * Check for an RSA key; if not then log but accept anyway.
+ * 1 == RSA
+ * 2 == RSA Encrypt-Only
+ * 3 == RSA Sign-Only
+ */
+ if (packet->data[7] < 1 || packet->data[7] > 3) {
+ logthing(LOGTHING_NOTICE,
+ "Type 2 or 3 key, but not RSA: %llx (type %d)",
+ keyid,
+ packet->data[7]);
+ }
+ break;
+ case 4:
+ get_fingerprint(packet, buff, &length);
for (keyid = 0, i = 12; i < 20; i++) {
keyid <<= 8;
break;
default:
- fprintf(stderr, "Unknown key type: %d\n",
- publickey->publickey->data[0]);
+ logthing(LOGTHING_ERROR, "Unknown key type: %d",
+ packet->data[0]);
}
return keyid;
projects / onak.git / blobdiff