/*
* parsekey.c - Routines to parse an OpenPGP key.
*
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004,2007-2008,2011 Jonathan McDowell <noodles@earth.li>
*
- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <stdbool.h>
#include "keyid.h"
#include "keystructs.h"
#include "ll.h"
-#include "log.h"
#include "mem.h"
+#include "onak.h"
#include "openpgp.h"
#include "parsekey.h"
* 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,
/*
* 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));
/*
* 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;
default:
- logthing(LOGTHING_ERROR,
- "Unsupported packet type: %d",
- packets->packet->tag);
+ /* Unsupported packet. Do what? Ignore for now. */
+ break;
}
packets = packets->next;
}
* packet stream and reads the packets into a linked list of packets
* ready for parsing as a public key or whatever.
*/
-int 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;
- 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;
- log_assert(packets != NULL);
+ if (packets == NULL)
+ return ONAK_E_INVALID_PARAM;
+
curpacket = *packets;
if (curpacket != NULL) {
while (curpacket->next != NULL) {
inpacket = true;
if (curpacket != NULL) {
curpacket->next = malloc(sizeof (*curpacket));
+ packetend = &curpacket->next;
curpacket = curpacket->next;
} else {
*packets = curpacket =
malloc(sizeof (*curpacket));
+ packetend = packets;
}
memset(curpacket, 0, sizeof(*curpacket));
curpacket->packet =
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
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;
}
}
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,
}
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);
}
* This function uses putchar_func to write characters to an OpenPGP
* packet stream from a linked list of packets.
*/
-int 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)
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 &= 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);
packets->packet->data);
packets = packets->next;
}
- return 0;
+
+ return ONAK_E_OK;
}
/**
projects / onak.git / blobdiff