projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Debian Vcs-* fields to point to git repository
[onak.git]
/
keyid.c
diff --git
a/keyid.c
b/keyid.c
index a7051f2d23552dc1bc8b5f9c464ced26c11f3f05..d114852bd3081b2f44da24fd785ccce3bada8dfe 100644
(file)
--- a/
keyid.c
+++ b/
keyid.c
@@
-21,95
+21,102
@@
#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 "keyid.h"
#include "keystructs.h"
-#include "
log
.h"
+#include "
onak
.h"
#include "parsekey.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
/**
* get_keyid - Given a public key returns the keyid.
* @publickey: The key to calculate the id for.
*/
/**
* get_keyid - Given a public key returns the keyid.
* @publickey: The key to calculate the id for.
*/
-
uint64_t get_keyid(struct openpgp_publickey *publickey
)
+
onak_status_t get_keyid(struct openpgp_publickey *publickey, uint64_t *keyid
)
{
{
- return (get_packetid(publickey->publickey));
+ return (get_packetid(publickey->publickey
, keyid
));
}
/**
* get_fingerprint - Given a public key returns the fingerprint.
* @publickey: The key to calculate the id for.
}
/**
* 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).
+ * @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.
*/
* @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,
+
onak_status_t
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;
- log_assert(fingerprint != NULL);
- log_assert(len != NULL);
+ if (fingerprint == NULL)
+ return ONAK_E_INVALID_PARAM;
+ if (len == NULL)
+ return ONAK_E_INVALID_PARAM;
*len = 0;
switch (packet->data[0]) {
case 2:
case 3:
*len = 0;
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:
- logthing(LOGTHING_ERROR, "Unknown key type: %d",
- packet->data[0]);
+ return ONAK_E_UNKNOWN_VER;
}
}
- return
fingerprint
;
+ return
ONAK_E_OK
;
}
}
@@
-117,15
+124,15
@@
unsigned char *get_fingerprint(struct openpgp_packet *packet,
* get_packetid - Given a PGP packet returns the keyid.
* @packet: The packet to calculate the id for.
*/
* 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
)
+
onak_status_t get_packetid(struct openpgp_packet *packet, uint64_t *keyid
)
{
{
- uint64_t keyid = 0;
int offset = 0;
int i = 0;
size_t length = 0;
unsigned char buff[20];
int offset = 0;
int i = 0;
size_t length = 0;
unsigned char buff[20];
- log_assert(packet != NULL);
+ if (packet == NULL)
+ return ONAK_E_INVALID_PARAM;
switch (packet->data[0]) {
case 2:
switch (packet->data[0]) {
case 2:
@@
-139,38
+146,34
@@
uint64_t get_packetid(struct openpgp_packet *packet)
packet->data[9];
offset = ((offset + 7) / 8) + 2;
packet->data[9];
offset = ((offset + 7) / 8) + 2;
- for (keyid = 0, i = 0; i < 8; i++) {
- keyid <<= 8;
- keyid += packet->data[offset++];
+ 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
.
+ * Check for an RSA key; if not
return an error
.
* 1 == RSA
* 2 == RSA Encrypt-Only
* 3 == RSA Sign-Only
*/
if (packet->data[7] < 1 || packet->data[7] > 3) {
* 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]);
+ return ONAK_E_INVALID_PKT;
}
break;
case 4:
get_fingerprint(packet, buff, &length);
}
break;
case 4:
get_fingerprint(packet, buff, &length);
- for (keyid = 0, i = 12; i < 20; i++) {
- keyid <<= 8;
- keyid += buff[i];
+ for (
*
keyid = 0, i = 12; i < 20; i++) {
+
*
keyid <<= 8;
+
*
keyid += buff[i];
}
break;
default:
}
break;
default:
- logthing(LOGTHING_ERROR, "Unknown key type: %d",
- packet->data[0]);
+ return ONAK_E_UNKNOWN_VER;
}
}
- return
keyid
;
+ return
ONAK_E_OK
;
}
static struct openpgp_packet_list *sortpackets(struct openpgp_packet_list
}
static struct openpgp_packet_list *sortpackets(struct openpgp_packet_list
@@
-194,7
+197,7
@@
static struct openpgp_packet_list *sortpackets(struct openpgp_packet_list
return sorted;
}
return sorted;
}
-
void
get_skshash(struct openpgp_publickey *key, struct skshash *hash)
+
onak_status_t
get_skshash(struct openpgp_publickey *key, struct skshash *hash)
{
struct openpgp_packet_list *packets = NULL, *list_end = NULL;
struct openpgp_packet_list *curpacket;
{
struct openpgp_packet_list *packets = NULL, *list_end = NULL;
struct openpgp_packet_list *curpacket;
@@
-212,21
+215,23
@@
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);
+
+ return ONAK_E_OK;
}
uint8_t hexdigit(char c)
}
uint8_t hexdigit(char c)