projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Define OpenPGP constants and use them rather than magic numbers
[onak.git]
/
parsekey.c
diff --git
a/parsekey.c
b/parsekey.c
index 2d9510697cbe8d893f9ae6c8017f6b419ba8b476..349d5c862903e6fecad1f3b00c804d6d0620e835 100644
(file)
--- a/
parsekey.c
+++ b/
parsekey.c
@@
-16,6
+16,7
@@
#include "ll.h"
#include "log.h"
#include "mem.h"
#include "ll.h"
#include "log.h"
#include "mem.h"
+#include "openpgp.h"
#include "parsekey.h"
/**
#include "parsekey.h"
/**
@@
-45,7
+46,7
@@
int parse_keys(struct openpgp_packet_list *packets,
while (packets != NULL) {
switch (packets->packet->tag) {
while (packets != NULL) {
switch (packets->packet->tag) {
- case
2
:
+ case
OPENPGP_PACKET_SIGNATURE
:
/*
* It's a signature packet. Add it to either the public
* key, to the current UID or the current subkey.
/*
* It's a signature packet. Add it to either the public
* key, to the current UID or the current subkey.
@@
-68,13
+69,15
@@
int parse_keys(struct openpgp_packet_list *packets,
* if it's a revocation.
*/
if (packets->packet->data[0] == 3 &&
* if it's a revocation.
*/
if (packets->packet->data[0] == 3 &&
- packets->packet->data[2] == 0x20) {
+ packets->packet->data[2] ==
+ OPENPGP_SIGTYPE_KEY_REV) {
/*
* Type 3 key, 0x20 == revocation
*/
curkey->revoked = true;
} else if (packets->packet->data[0] == 4 &&
/*
* Type 3 key, 0x20 == revocation
*/
curkey->revoked = true;
} else if (packets->packet->data[0] == 4 &&
- packets->packet->data[1] == 0x20) {
+ packets->packet->data[1] ==
+ OPENPGP_SIGTYPE_KEY_REV) {
/*
* Type 4 key, 0x20 == revocation
*/
/*
* Type 4 key, 0x20 == revocation
*/
@@
-82,7
+85,7
@@
int parse_keys(struct openpgp_packet_list *packets,
}
}
break;
}
}
break;
- case
6
:
+ case
OPENPGP_PACKET_PUBLICKEY
:
/*
* It's a public key packet, so start a new key in our
* list.
/*
* It's a public key packet, so start a new key in our
* list.
@@
-98,8
+101,8
@@
int parse_keys(struct openpgp_packet_list *packets,
curkey->publickey = packet_dup(packets->packet);
count++;
break;
curkey->publickey = packet_dup(packets->packet);
count++;
break;
- case
13
:
- case
17
:
+ case
OPENPGP_PACKET_UID
:
+ case
OPENPGP_PACKET_UAT
:
/*
* It's a UID packet (or a photo id, which is similar).
*/
/*
* It's a UID packet (or a photo id, which is similar).
*/
@@
-109,7
+112,7
@@
int parse_keys(struct openpgp_packet_list *packets,
uid,
packet_dup(packets->packet));
break;
uid,
packet_dup(packets->packet));
break;
- case
14
:
+ case
OPENPGP_PACKET_PUBLICSUBKEY
:
/*
* It's a subkey packet.
*/
/*
* It's a subkey packet.
*/
@@
-118,7
+121,7
@@
int parse_keys(struct openpgp_packet_list *packets,
subkey,
packet_dup(packets->packet));
break;
subkey,
packet_dup(packets->packet));
break;
- case
12
:
+ case
OPENPGP_PACKET_TRUST
:
case 61:
/*
* One of:
case 61:
/*
* One of:
@@
-284,7
+287,8
@@
int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
}
if (rc == 0) {
}
if (rc == 0) {
- if (curpacket->packet->tag == 6) {
+ if (curpacket->packet->tag ==
+ OPENPGP_PACKET_PUBLICKEY) {
keys++;
}
curpacket->packet->data =
keys++;
}
curpacket->packet->data =