projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use nettle for hashing when available rather than internal MD5/SHA1 routines
[onak.git]
/
keyid.c
diff --git
a/keyid.c
b/keyid.c
index a7051f2d23552dc1bc8b5f9c464ced26c11f3f05..c75f0a178854b3146bb8aa252cc1b4f27c43af07 100644
(file)
--- a/
keyid.c
+++ b/
keyid.c
@@
-21,14
+21,21
@@
#include <sys/types.h>
#include <arpa/inet.h>
#include <sys/types.h>
#include <arpa/inet.h>
+#include "config.h"
#include "keyid.h"
#include "keystructs.h"
#include "log.h"
#include "parsekey.h"
#include "keyid.h"
#include "keystructs.h"
#include "log.h"
#include "parsekey.h"
-#include "md5.h"
#include "mem.h"
#include "merge.h"
#include "mem.h"
#include "merge.h"
+
+#ifdef HAVE_NETTLE
+#include <nettle/md5.h>
+#include <nettle/sha.h>
+#else
+#include "md5.h"
#include "sha1.h"
#include "sha1.h"
+#endif
/**
/**
@@
-54,7
+61,7
@@
unsigned char *get_fingerprint(struct openpgp_packet *packet,
unsigned char *fingerprint,
size_t *len)
{
unsigned char *fingerprint,
size_t *len)
{
-
SHA1_CTX
sha_ctx;
+
struct sha1_ctx
sha_ctx;
struct md5_ctx md5_context;
unsigned char c;
size_t modlen, explen;
struct md5_ctx md5_context;
unsigned char c;
size_t modlen, explen;
@@
-67,41
+74,40
@@
unsigned char *get_fingerprint(struct openpgp_packet *packet,
switch (packet->data[0]) {
case 2:
case 3:
switch (packet->data[0]) {
case 2:
case 3:
- md5_init
_ctx
(&md5_context);
+ md5_init(&md5_context);
/*
* MD5 the modulus and exponent.
*/
modlen = ((packet->data[8] << 8) +
packet->data[9] + 7) >> 3;
/*
* MD5 the modulus and exponent.
*/
modlen = ((packet->data[8] << 8) +
packet->data[9] + 7) >> 3;
- md5_
process_bytes(&packet->data[10], modlen, &md5_context
);
+ md5_
update(&md5_context, modlen, &packet->data[10]
);
explen = ((packet->data[10+modlen] << 8) +
packet->data[11+modlen] + 7) >> 3;
explen = ((packet->data[10+modlen] << 8) +
packet->data[11+modlen] + 7) >> 3;
- md5_process_bytes(&packet->data[12 + modlen], explen,
- &md5_context);
+ md5_update(&md5_context, explen, &packet->data[12 + modlen]);
- md5_finish_ctx(&md5_context, fingerprint);
*len = 16;
*len = 16;
+ md5_digest(&md5_context, *len, fingerprint);
break;
case 4:
break;
case 4:
-
SHA1I
nit(&sha_ctx);
+
sha1_i
nit(&sha_ctx);
/*
* TODO: Can this be 0x99? Are all public key packets old
* format with 2 bytes of length data?
*/
c = 0x99;
/*
* TODO: Can this be 0x99? Are all public key packets old
* format with 2 bytes of length data?
*/
c = 0x99;
-
SHA1Update(&sha_ctx, &c, sizeof(c)
);
+
sha1_update(&sha_ctx, sizeof(c), &c
);
c = packet->length >> 8;
c = packet->length >> 8;
-
SHA1Update(&sha_ctx, &c, sizeof(c)
);
+
sha1_update(&sha_ctx, sizeof(c), &c
);
c = packet->length & 0xFF;
c = packet->length & 0xFF;
- SHA1Update(&sha_ctx, &c, sizeof(c));
- SHA1Update(&sha_ctx, packet->data,
- packet->length);
- SHA1Final(fingerprint, &sha_ctx);
+ sha1_update(&sha_ctx, sizeof(c), &c);
+ sha1_update(&sha_ctx, packet->length,
+ packet->data);
*len = 20;
*len = 20;
+ sha1_digest(&sha_ctx, *len, fingerprint);
break;
default:
break;
default:
@@
-212,20
+218,20
@@
void get_skshash(struct openpgp_publickey *key, struct skshash *hash)
key->next = next;
packets = sortpackets(packets);
key->next = next;
packets = sortpackets(packets);
- md5_init
_ctx
(&md5_context);
+ md5_init(&md5_context);
for (curpacket = packets; curpacket != NULL;
curpacket = curpacket->next) {
tmp = htonl(curpacket->packet->tag);
for (curpacket = packets; curpacket != NULL;
curpacket = curpacket->next) {
tmp = htonl(curpacket->packet->tag);
- md5_
process_bytes(&tmp, sizeof(tmp), &md5_context
);
+ md5_
update(&md5_context, sizeof(tmp), (void *) &tmp
);
tmp = htonl(curpacket->packet->length);
tmp = htonl(curpacket->packet->length);
- md5_
process_bytes(&tmp, sizeof(tmp), &md5_context
);
- md5_
process_bytes(curpacket->packet->data
,
+ md5_
update(&md5_context, sizeof(tmp), (void *) &tmp
);
+ md5_
update(&md5_context
,
curpacket->packet->length,
curpacket->packet->length,
-
&md5_context
);
+
curpacket->packet->data
);
}
}
- md5_
finish_ctx(&md5_context,
&hash->hash);
+ md5_
digest(&md5_context, 16, (uint8_t *)
&hash->hash);
free_packet_list(packets);
}
free_packet_list(packets);
}