X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=parsekey.c;h=e3fe800d9a203341d44e47993cd2da3c573d2383;hb=HEAD;hp=008248e005633f0563d9bdcd409c61130cfc1423;hpb=5d859953e393a2539e67df3ce73798e7029cf5b9;p=onak.git
diff --git a/parsekey.c b/parsekey.c
index 008248e..e3fe800 100644
--- a/parsekey.c
+++ b/parsekey.c
@@ -13,8 +13,7 @@
* 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.
+ * this program. If not, see .
*/
#include
@@ -22,7 +21,6 @@
#include
#include
-#include "keyid.h"
#include "keystructs.h"
#include "ll.h"
#include "mem.h"
@@ -184,7 +182,7 @@ 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.
*/
-onak_status_t read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
+onak_status_t read_openpgp_stream(size_t (*getchar_func)(void *ctx, size_t count,
void *c),
void *ctx,
struct openpgp_packet_list **packets,
@@ -206,7 +204,7 @@ onak_status_t read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
}
while (rc == ONAK_E_OK && (maxnum == 0 || keys < maxnum) &&
- !getchar_func(ctx, 1, &curchar)) {
+ (getchar_func(ctx, 1, &curchar) == 1)) {
if (curchar & 0x80) {
/*
* New packet. Allocate memory for it.
@@ -233,14 +231,14 @@ onak_status_t read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
*/
if (curpacket->packet->newformat) {
curpacket->packet->tag = (curchar & 0x3F);
- if (getchar_func(ctx, 1, &curchar)) {
+ if (getchar_func(ctx, 1, &curchar) == 0) {
rc = ONAK_E_INVALID_PKT;
break;
}
curpacket->packet->length = curchar;
if (curpacket->packet->length > 191 &&
curpacket->packet->length < 224) {
- rc = getchar_func(ctx, 1, &curchar);
+ rc = getchar_func(ctx, 1, &curchar) ? ONAK_E_OK : ONAK_E_IO_ERROR;
curpacket->packet->length -= 192;
curpacket->packet->length <<= 8;
curpacket->packet->length += curchar;
@@ -252,28 +250,28 @@ onak_status_t read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
rc = ONAK_E_UNSUPPORTED_FEATURE;
} else if (curpacket->packet->length == 255) {
/*
- * 5 byte length; ie 255 followed by 3
+ * 5 byte length; ie 255 followed by 4
* bytes of MSB length.
*/
- if (getchar_func(ctx, 1, &curchar)) {
+ if (getchar_func(ctx, 1, &curchar) != 1) {
rc = ONAK_E_INVALID_PKT;
break;
}
curpacket->packet->length = curchar;
curpacket->packet->length <<= 8;
- if (getchar_func(ctx, 1, &curchar)) {
+ if (getchar_func(ctx, 1, &curchar) != 1) {
rc = ONAK_E_INVALID_PKT;
break;
}
curpacket->packet->length += curchar;
curpacket->packet->length <<= 8;
- if (getchar_func(ctx, 1, &curchar)) {
+ if (getchar_func(ctx, 1, &curchar) != 1) {
rc = ONAK_E_INVALID_PKT;
break;
}
curpacket->packet->length += curchar;
curpacket->packet->length <<= 8;
- if (getchar_func(ctx, 1, &curchar)) {
+ if (getchar_func(ctx, 1, &curchar) != 1) {
rc = ONAK_E_INVALID_PKT;
break;
}
@@ -283,45 +281,45 @@ onak_status_t read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
curpacket->packet->tag = (curchar & 0x3C) >> 2;
switch (curchar & 3) {
case 0:
- if (getchar_func(ctx, 1, &curchar)) {
+ if (getchar_func(ctx, 1, &curchar) != 1) {
rc = ONAK_E_INVALID_PKT;
break;
}
curpacket->packet->length = curchar;
break;
case 1:
- if (getchar_func(ctx, 1, &curchar)) {
+ if (getchar_func(ctx, 1, &curchar) != 1) {
rc = ONAK_E_INVALID_PKT;
break;
}
curpacket->packet->length = curchar;
curpacket->packet->length <<= 8;
- if (getchar_func(ctx, 1, &curchar)) {
+ if (getchar_func(ctx, 1, &curchar) != 1) {
rc = ONAK_E_INVALID_PKT;
break;
}
curpacket->packet->length += curchar;
break;
case 2:
- if (getchar_func(ctx, 1, &curchar)) {
+ if (getchar_func(ctx, 1, &curchar) != 1) {
rc = ONAK_E_INVALID_PKT;
break;
}
curpacket->packet->length =
((unsigned) curchar << 24);
- if (getchar_func(ctx, 1, &curchar)) {
+ if (getchar_func(ctx, 1, &curchar) != 1) {
rc = ONAK_E_INVALID_PKT;
break;
}
curpacket->packet->length +=
(curchar << 16);
- if (getchar_func(ctx, 1, &curchar)) {
+ if (getchar_func(ctx, 1, &curchar) != 1) {
rc = ONAK_E_INVALID_PKT;
break;
}
curpacket->packet->length +=
(curchar << 8);
- if (getchar_func(ctx, 1, &curchar)) {
+ if (getchar_func(ctx, 1, &curchar) != 1) {
rc = ONAK_E_INVALID_PKT;
break;
}
@@ -348,12 +346,47 @@ onak_status_t read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
} else {
rc = getchar_func(ctx,
curpacket->packet->length,
- curpacket->packet->data);
+ curpacket->packet->data) ?
+ ONAK_E_OK : ONAK_E_IO_ERROR;
}
}
} else {
rc = ONAK_E_INVALID_PKT;
}
+ if (rc == ONAK_E_OK) {
+ /* Make sure the packet version is sane */
+ switch (curpacket->packet->tag) {
+ case OPENPGP_PACKET_ENCRYPTED_MDC:
+ /* These packets must be v1 */
+ if (curpacket->packet->data[0] != 1) {
+ rc = ONAK_E_INVALID_PKT;
+ }
+ break;
+ case OPENPGP_PACKET_PKSESSIONKEY:
+ case OPENPGP_PACKET_ONEPASSSIG:
+ /* These packets must be v3 */
+ if (curpacket->packet->data[0] != 3) {
+ rc = ONAK_E_INVALID_PKT;
+ }
+ break;
+ case OPENPGP_PACKET_SYMSESSIONKEY:
+ /* These packets must be v4 */
+ if (curpacket->packet->data[0] != 4) {
+ rc = ONAK_E_INVALID_PKT;
+ }
+ break;
+ case OPENPGP_PACKET_SIGNATURE:
+ case OPENPGP_PACKET_SECRETKEY:
+ case OPENPGP_PACKET_PUBLICKEY:
+ /* Must be v2 onwards */
+ if (curpacket->packet->data[0] < 2) {
+ rc = ONAK_E_INVALID_PKT;
+ }
+ break;
+ default:
+ break;
+ }
+ }
}
if (packetend != NULL) {
@@ -389,7 +422,7 @@ onak_status_t 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.
*/
-onak_status_t write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
+onak_status_t write_openpgp_stream(size_t (*putchar_func)(void *ctx, size_t count,
void *c),
void *ctx,
struct openpgp_packet_list *packets)