#include "sha1.h"
#endif
+uint64_t fingerprint2keyid(struct openpgp_fingerprint *fingerprint)
+{
+ uint64_t keyid;
+ int i;
+
+ for (keyid = 0, i = 12; i < 20; i++) {
+ keyid <<= 8;
+ keyid += fingerprint->fp[i];
+ }
+
+ return keyid;
+}
+
/**
* get_keyid - Given a public key returns the keyid.
* which we've returned.
*/
onak_status_t get_fingerprint(struct openpgp_packet *packet,
- unsigned char *fingerprint,
- size_t *len)
+ struct openpgp_fingerprint *fingerprint)
{
struct sha1_ctx sha_ctx;
struct md5_ctx md5_context;
if (fingerprint == NULL)
return ONAK_E_INVALID_PARAM;
- if (len == NULL)
- return ONAK_E_INVALID_PARAM;
- *len = 0;
+ fingerprint->length = 0;
switch (packet->data[0]) {
case 2:
packet->data[11+modlen] + 7) >> 3;
md5_update(&md5_context, explen, &packet->data[12 + modlen]);
- *len = 16;
- md5_digest(&md5_context, *len, fingerprint);
+ fingerprint->length = 16;
+ md5_digest(&md5_context, fingerprint->length, fingerprint->fp);
break;
sha1_update(&sha_ctx, sizeof(c), &c);
sha1_update(&sha_ctx, packet->length,
packet->data);
- *len = 20;
- sha1_digest(&sha_ctx, *len, fingerprint);
+ fingerprint->length = 20;
+ sha1_digest(&sha_ctx, fingerprint->length, fingerprint->fp);
break;
default:
{
int offset = 0;
int i = 0;
- size_t length = 0;
- unsigned char buff[20];
+ struct openpgp_fingerprint fingerprint;
#ifdef NETTLE_WITH_RIPEMD160
struct ripemd160_ctx ripemd160_context;
uint8_t data;
ripemd160_digest(&ripemd160_context,
RIPEMD160_DIGEST_SIZE,
- buff);
+ fingerprint.fp);
+ fingerprint.length = RIPEMD160_DIGEST_SIZE;
- for (*keyid = 0, i = 12; i < 20; i++) {
- *keyid <<= 8;
- *keyid += buff[i];
- }
+ *keyid = fingerprint2keyid(&fingerprint);
return ONAK_E_OK;
}
}
break;
case 4:
- get_fingerprint(packet, buff, &length);
-
- for (*keyid = 0, i = 12; i < 20; i++) {
- *keyid <<= 8;
- *keyid += buff[i];
- }
+ get_fingerprint(packet, &fingerprint);
+
+ *keyid = fingerprint2keyid(&fingerprint);
break;
default: