return gcry_strerror(gcry_err_code(gret));
}
-static int decode_key(const char *key_file, const char *header_str,
- const char *footer_str, unsigned char **result)
+/** Private keys start with this header. */
+#define PRIVATE_KEY_HEADER "-----BEGIN RSA PRIVATE KEY-----"
+/** Private keys end with this footer. */
+#define PRIVATE_KEY_FOOTER "-----END RSA PRIVATE KEY-----"
+
+static int decode_key(const char *key_file, unsigned char **result,
+ size_t *blob_size)
{
int ret, ret2, i, j;
void *map;
- size_t map_size, key_size, blob_size;
+ size_t map_size, key_size;
unsigned char *blob = NULL;
char *begin, *footer, *key;
if (ret < 0)
goto out;
ret = -E_KEY_MARKER;
- if (strncmp(map, header_str, strlen(header_str)))
+ if (strncmp(map, PRIVATE_KEY_HEADER, strlen(PRIVATE_KEY_HEADER)))
goto unmap;
- footer = strstr(map, footer_str);
+ footer = strstr(map, PRIVATE_KEY_FOOTER);
ret = -E_KEY_MARKER;
if (!footer)
goto unmap;
- begin = map + strlen(header_str);
+ begin = map + strlen(PRIVATE_KEY_HEADER);
/* skip whitespace at the beginning */
for (; begin < footer; begin++) {
if (para_isspace(*begin))
key[j++] = begin[i];
}
key[j] = '\0';
- ret = base64_decode(key, j, (char **)&blob, &blob_size);
+ ret = base64_decode(key, j, (char **)&blob, blob_size);
free(key);
- if (ret < 0)
- goto free_unmap;
- ret = blob_size;
- goto unmap;
-free_unmap:
- free(blob);
- blob = NULL;
unmap:
ret2 = para_munmap(map, map_size);
if (ret >= 0 && ret2 < 0)
/*
* Returns: Number of bytes scanned. This may differ from the value returned via
- * bn_bytes because the latter does not include the ASN.1 prefix and a leading
- * zero is not considered as an additional byte for bn_bytes.
+ * bitsp because the latter does not include the ASN.1 prefix and a leading
+ * zero is not considered as an additional byte for the number of bits.
*/
static int read_bignum(unsigned char *start, unsigned char *end, gcry_mpi_t *bn,
- int *bn_bytes)
+ unsigned *bitsp)
{
int i, bn_size;
gcry_error_t gret;
cp++;
bn_size--;
}
- if (bn_bytes)
- *bn_bytes = bn_size;
+ if (bitsp)
+ *bitsp = bn_size * 8;
cp += bn_size;
// unsigned char *buf;
// gcry_mpi_aprint(GCRYMPI_FMT_HEX, &buf, NULL, *bn);
return p - data;
}
-/** Private keys start with this header. */
-#define PRIVATE_KEY_HEADER "-----BEGIN RSA PRIVATE KEY-----"
-/** Private keys end with this footer. */
-#define PRIVATE_KEY_FOOTER "-----END RSA PRIVATE KEY-----"
-
static int get_private_key(const char *key_file, struct asymmetric_key **result)
{
gcry_mpi_t n = NULL, e = NULL, d = NULL, p = NULL, q = NULL,
u = NULL;
unsigned char *blob, *cp, *end;
- int blob_size, ret, n_size;
+ int ret;
+ unsigned bits;
gcry_error_t gret;
- size_t erroff;
+ size_t erroff, blob_size;
gcry_sexp_t sexp;
struct asymmetric_key *key;
*result = NULL;
- ret = decode_key(key_file, PRIVATE_KEY_HEADER, PRIVATE_KEY_FOOTER,
- &blob);
+ ret = decode_key(key_file, &blob, &blob_size);
if (ret < 0)
return ret;
- blob_size = ret;
end = blob + blob_size;
ret = find_privkey_bignum_offset(blob, blob_size);
if (ret < 0)
PARA_INFO_LOG("reading RSA params at offset %d\n", ret);
cp = blob + ret;
- ret = read_bignum(cp, end, &n, &n_size);
+ ret = read_bignum(cp, end, &n, &bits);
if (ret < 0)
goto free_blob;
cp += ret;
key = para_malloc(sizeof(*key));
key->sexp = sexp;
*result = key;
- ret = n_size * 8;
+ ret = bits;
PARA_INFO_LOG("succesfully read %d bit private key\n", ret);
release_u:
gcry_mpi_release(u);