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]
/
parsekey.c
diff --git
a/parsekey.c
b/parsekey.c
index 517b0294a1452d26f23717052df85e64697365a3..f780520c9c7f5a9e251217370970d3785bcb4176 100644
(file)
--- a/
parsekey.c
+++ b/
parsekey.c
@@
-25,8
+25,8
@@
#include "keyid.h"
#include "keystructs.h"
#include "ll.h"
#include "keyid.h"
#include "keystructs.h"
#include "ll.h"
-#include "log.h"
#include "mem.h"
#include "mem.h"
+#include "onak.h"
#include "openpgp.h"
#include "parsekey.h"
#include "openpgp.h"
#include "parsekey.h"
@@
-62,7
+62,8
@@
int parse_keys(struct openpgp_packet_list *packets,
* 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.
*/
- log_assert(curkey != NULL);
+ if (curkey == NULL)
+ return ONAK_E_INVALID_PARAM;
if (curkey->subkeys != NULL) {
ADD_PACKET_TO_LIST_END(curkey->last_subkey,
sig,
if (curkey->subkeys != NULL) {
ADD_PACKET_TO_LIST_END(curkey->last_subkey,
sig,
@@
-117,8
+118,10
@@
int parse_keys(struct openpgp_packet_list *packets,
/*
* It's a UID packet (or a photo id, which is similar).
*/
/*
* It's a UID packet (or a photo id, which is similar).
*/
- log_assert(curkey != NULL);
- log_assert(curkey->subkeys == NULL);
+ if (curkey == NULL)
+ return ONAK_E_INVALID_PARAM;
+ if (curkey->subkeys != NULL)
+ return ONAK_E_INVALID_PARAM;
ADD_PACKET_TO_LIST_END(curkey,
uid,
packet_dup(packets->packet));
ADD_PACKET_TO_LIST_END(curkey,
uid,
packet_dup(packets->packet));
@@
-127,13
+130,14
@@
int parse_keys(struct openpgp_packet_list *packets,
/*
* It's a subkey packet.
*/
/*
* It's a subkey packet.
*/
- log_assert(curkey != NULL);
+ if (curkey == NULL)
+ return ONAK_E_INVALID_PARAM;
ADD_PACKET_TO_LIST_END(curkey,
subkey,
packet_dup(packets->packet));
break;
case OPENPGP_PACKET_TRUST:
ADD_PACKET_TO_LIST_END(curkey,
subkey,
packet_dup(packets->packet));
break;
case OPENPGP_PACKET_TRUST:
- case
61
:
+ case
OPENPGP_PACKET_COMMENT
:
/*
* One of:
*
/*
* One of:
*
@@
-142,9
+146,8
@@
int parse_keys(struct openpgp_packet_list *packets,
*/
break;
default:
*/
break;
default:
- logthing(LOGTHING_ERROR,
- "Unsupported packet type: %d",
- packets->packet->tag);
+ /* Unsupported packet. Do what? Ignore for now. */
+ break;
}
packets = packets->next;
}
}
packets = packets->next;
}
@@
-181,19
+184,21
@@
int debug_packet(struct openpgp_packet *packet)
* packet stream and reads the packets into a linked list of packets
* ready for parsing as a public key or whatever.
*/
* packet stream and reads the packets into a linked list of packets
* ready for parsing as a public key or whatever.
*/
-
in
t read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
+
onak_status_
t read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
void *c),
void *ctx,
struct openpgp_packet_list **packets,
int maxnum)
{
unsigned char curchar = 0;
void *c),
void *ctx,
struct openpgp_packet_list **packets,
int maxnum)
{
unsigned char curchar = 0;
- struct openpgp_packet_list *curpacket = NULL;
-
int rc = 0
;
+ struct openpgp_packet_list *curpacket = NULL
, **packetend = NULL
;
+
onak_status_t rc = ONAK_E_OK
;
int keys = 0;
bool inpacket = false;
int keys = 0;
bool inpacket = false;
- log_assert(packets != NULL);
+ if (packets == NULL)
+ return ONAK_E_INVALID_PARAM;
+
curpacket = *packets;
if (curpacket != NULL) {
while (curpacket->next != NULL) {
curpacket = *packets;
if (curpacket != NULL) {
while (curpacket->next != NULL) {
@@
-211,10
+216,12
@@
int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
inpacket = true;
if (curpacket != NULL) {
curpacket->next = malloc(sizeof (*curpacket));
inpacket = true;
if (curpacket != NULL) {
curpacket->next = malloc(sizeof (*curpacket));
+ packetend = &curpacket->next;
curpacket = curpacket->next;
} else {
*packets = curpacket =
malloc(sizeof (*curpacket));
curpacket = curpacket->next;
} else {
*packets = curpacket =
malloc(sizeof (*curpacket));
+ packetend = packets;
}
memset(curpacket, 0, sizeof(*curpacket));
curpacket->packet =
}
memset(curpacket, 0, sizeof(*curpacket));
curpacket->packet =
@@
-240,9
+247,9
@@
int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
curpacket->packet->length += 192;
} else if (curpacket->packet->length > 223 &&
curpacket->packet->length < 255) {
curpacket->packet->length += 192;
} else if (curpacket->packet->length > 223 &&
curpacket->packet->length < 255) {
- logthing(LOGTHING_NOTICE,
- "Partial length;"
-
" not supported.")
;
+ free(curpacket->packet);
+ curpacket->packet = NULL;
+
rc = ONAK_E_UNSUPPORTED_FEATURE
;
} else if (curpacket->packet->length == 255) {
/*
* 5 byte length; ie 255 followed by 3
} else if (curpacket->packet->length == 255) {
/*
* 5 byte length; ie 255 followed by 3
@@
-288,11
+295,9
@@
int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
curpacket->packet->length += curchar;
break;
case 3:
curpacket->packet->length += curchar;
break;
case 3:
- logthing(LOGTHING_ERROR,
- "Unsupported length type 3.");
- curpacket->packet->length = 0;
- curpacket->packet->data = NULL;
- rc = -1;
+ rc = ONAK_E_UNSUPPORTED_FEATURE;
+ free(curpacket->packet);
+ curpacket->packet = NULL;
break;
}
}
break;
}
}
@@
-306,10
+311,7
@@
int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
malloc(curpacket->packet->length *
sizeof(unsigned char));
if (curpacket->packet->data == NULL) {
malloc(curpacket->packet->length *
sizeof(unsigned char));
if (curpacket->packet->data == NULL) {
- logthing(LOGTHING_ERROR,
- "Can't allocate memory for "
- "packet!");
- rc = -1;
+ rc = ONAK_E_NOMEM;
} else {
rc = getchar_func(ctx,
curpacket->packet->length,
} else {
rc = getchar_func(ctx,
curpacket->packet->length,
@@
-318,12
+320,16
@@
int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
}
inpacket = false;
} else {
}
inpacket = false;
} else {
- logthing(LOGTHING_ERROR, "Unexpected character: 0x%X",
- curchar);
- rc = 1;
+ rc = ONAK_E_INVALID_PKT;
}
}
}
}
+ /* Trim the last packet if it doesn't actually exist */
+ if (packetend != NULL && (*packetend)->packet == NULL) {
+ free(*packetend);
+ *packetend = NULL;
+ }
+
return (rc);
}
return (rc);
}
@@
-336,7
+342,7
@@
int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
* This function uses putchar_func to write characters to an OpenPGP
* packet stream from a linked list of packets.
*/
* This function uses putchar_func to write characters to an OpenPGP
* packet stream from a linked list of packets.
*/
-
in
t write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
+
onak_status_
t write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
void *c),
void *ctx,
struct openpgp_packet_list *packets)
void *c),
void *ctx,
struct openpgp_packet_list *packets)
@@
-364,8
+370,6
@@
int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
putchar_func(ctx, 1, &curchar);
} else if (packets->packet->length > 8382 &&
packets->packet->length < 0xFFFFFFFF) {
putchar_func(ctx, 1, &curchar);
} else if (packets->packet->length > 8382 &&
packets->packet->length < 0xFFFFFFFF) {
- logthing(LOGTHING_DEBUG,
- "Writing 5 byte length");
curchar = 255;
putchar_func(ctx, 1, &curchar);
curchar = 255;
putchar_func(ctx, 1, &curchar);
@@
-385,8
+389,7
@@
int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
curchar &= 0xFF;
putchar_func(ctx, 1, &curchar);
} else {
curchar &= 0xFF;
putchar_func(ctx, 1, &curchar);
} else {
- logthing(LOGTHING_ERROR,
- "Unsupported new format length.");
+ return ONAK_E_UNSUPPORTED_FEATURE;
}
} else {
curchar |= (packets->packet->tag << 2);
}
} else {
curchar |= (packets->packet->tag << 2);
@@
-419,7
+422,8
@@
int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
packets->packet->data);
packets = packets->next;
}
packets->packet->data);
packets = packets->next;
}
- return 0;
+
+ return ONAK_E_OK;
}
/**
}
/**