/** A running CRC24 of the data we've seen. */
long crc24;
/** The function to output a character. */
- int (*putchar_func)(void *ctx, size_t count, void *c);
+ size_t (*putchar_func)(void *ctx, size_t count, void *c);
/** Context for putchar_func. */
void *ctx;
};
}
-static int armor_putchar(void *ctx, size_t count, void *c)
+static size_t armor_putchar(void *ctx, size_t count, void *c)
{
int i;
for (i = 0; i < count; i++) {
armor_putchar_int(ctx, ((char *) c)[i]);
}
-
- return 0;
+
+ return count;
}
/**
/** A running CRC24 of the data we've seen. */
long crc24;
/** The function to get the next character. */
- int (*getchar_func)(void *ctx, size_t count, void *c);
+ size_t (*getchar_func)(void *ctx, size_t count, void *c);
/** Context for getchar_func. */
void *ctx;
};
return (tmpc == 64);
}
-static int dearmor_getchar_c(void *ctx, size_t count, void *c)
+static size_t dearmor_getchar_c(void *ctx, size_t count, void *c)
{
int i, rc = 0;
rc = dearmor_getchar(ctx, &((unsigned char *) c)[i]);
}
- return rc;
+ return (rc == 0) ? i : 0;
}
-int armor_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
+int armor_openpgp_stream(size_t (*putchar_func)(void *ctx, size_t count,
void *c),
void *ctx,
struct openpgp_packet_list *packets)
/*
* Print armor header
*/
- putchar_func(ctx, sizeof("-----BEGIN PGP PUBLIC KEY BLOCK-----\n") - 1,
- (unsigned char *) "-----BEGIN PGP PUBLIC KEY BLOCK-----\n");
- putchar_func(ctx, sizeof("Version: onak " ONAK_VERSION "\n\n") - 1,
- (unsigned char *) "Version: onak " ONAK_VERSION "\n\n");
-
+ putchar_func(ctx, sizeof("-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n") - 1,
+ (unsigned char *) "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n");
+
armor_init(&armor_ctx);
armor_ctx.putchar_func = putchar_func;
armor_ctx.ctx = ctx;
return 0;
}
-int dearmor_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
+int dearmor_openpgp_stream(size_t (*getchar_func)(void *ctx, size_t count,
void *c),
void *ctx,
struct openpgp_packet_list **packets)
* with :s in them, then a blank line, then the data.
*/
state = 1;
- while (state != 4 && !getchar_func(ctx, 1, &curchar)) {
+ while (state != 4 && getchar_func(ctx, 1, &curchar) == 1) {
switch (state) {
case 0:
if (curchar == '\n') {