X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gcrypt.c;h=0ba8d526a3dd224135a73991e5b149c4a4eef1fb;hp=5202c9b713eba8eba300d9ef336ffeae801ba03b;hb=0d80158e37ae419695fbd51eed59b92b9ebccf5d;hpb=1bec000ff43c20d8c2f904678d1845ee65b4ba18

diff --git a/gcrypt.c b/gcrypt.c
index 5202c9b7..0ba8d526 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -189,64 +189,6 @@ static inline int get_long_form_num_length_bytes(unsigned char c)
 	return c & 0x7f;
 }
 
-static int find_pubkey_bignum_offset(const unsigned char *data, int len)
-{
-	const unsigned char *p = data, *end = data + len;
-
-	/* the whole thing starts with one sequence */
-	if (*p != ASN1_TYPE_SEQUENCE)
-		return -E_ASN1_PARSE;
-	p++;
-	if (p >= end)
-		return -E_ASN1_PARSE;
-	if (is_short_form(*p))
-		p++;
-	else
-		p += 1 + get_long_form_num_length_bytes(*p);
-	if (p >= end)
-		return -E_ASN1_PARSE;
-	/* another sequence containing the object id, skip it */
-	if (*p != ASN1_TYPE_SEQUENCE)
-		return -E_ASN1_PARSE;
-	p++;
-	if (p >= end)
-		return -E_ASN1_PARSE;
-	if (!is_short_form(*p))
-		return -E_ASN1_PARSE;
-	p += 1 + get_short_form_length(*p);
-	if (p >= end)
-		return -E_ASN1_PARSE;
-	/* all numbers are wrapped in a bit string object that follows */
-	if (*p != ASN1_TYPE_BIT_STRING)
-		return -E_ASN1_PARSE;
-	p++;
-	if (p >= end)
-		return -E_ASN1_PARSE;
-	if (is_short_form(*p))
-		p++;
-	else
-		p += 1 + get_long_form_num_length_bytes(*p);
-	p++; /* skip number of unused bits in the bit string */
-	if (p >= end)
-		return -E_ASN1_PARSE;
-
-	/* next, we have a sequence of two integers (n and e) */
-	if (*p != ASN1_TYPE_SEQUENCE)
-		return -E_ASN1_PARSE;
-	p++;
-	if (p >= end)
-		return -E_ASN1_PARSE;
-	if (is_short_form(*p))
-		p++;
-	else
-		p += 1 + get_long_form_num_length_bytes(*p);
-	if (p >= end)
-		return -E_ASN1_PARSE;
-	if (*p != ASN1_TYPE_INTEGER)
-		return -E_ASN1_PARSE;
-	return p - data;
-}
-
 /*
  * 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
@@ -348,6 +290,7 @@ static int get_private_key(const char *key_file, struct asymmetric_key **result)
 	gcry_sexp_t sexp;
 	struct asymmetric_key *key;
 
+	*result = NULL;
 	ret = decode_key(key_file, PRIVATE_KEY_HEADER, PRIVATE_KEY_FOOTER,
 		&blob);
 	if (ret < 0)
@@ -426,65 +369,6 @@ free_blob:
 	return ret;
 }
 
-/** Public keys start with this header. */
-#define PUBLIC_KEY_HEADER "-----BEGIN PUBLIC KEY-----"
-/** Public keys end with this footer. */
-#define PUBLIC_KEY_FOOTER "-----END PUBLIC KEY-----"
-
-static int get_asn_public_key(const char *key_file, struct asymmetric_key **result)
-{
-	gcry_mpi_t n = NULL, e = NULL;
-	unsigned char *blob, *cp, *end;
-	int blob_size, ret, n_size;
-	gcry_error_t gret;
-	size_t erroff;
-	gcry_sexp_t sexp;
-	struct asymmetric_key *key;
-
-	ret = decode_key(key_file, PUBLIC_KEY_HEADER, PUBLIC_KEY_FOOTER,
-		&blob);
-	if (ret < 0)
-		return ret;
-	blob_size = ret;
-	end = blob + blob_size;
-	ret = find_pubkey_bignum_offset(blob, blob_size);
-	if (ret < 0)
-		goto free_blob;
-	PARA_DEBUG_LOG("decoding public RSA params at offset %d\n", ret);
-	cp = blob + ret;
-
-	ret = read_bignum(cp, end, &n, &n_size);
-	if (ret < 0)
-		goto free_blob;
-	cp += ret;
-
-	ret = read_bignum(cp, end, &e, NULL);
-	if (ret < 0)
-		goto release_n;
-
-	gret = gcry_sexp_build(&sexp, &erroff, RSA_PUBKEY_SEXP, n, e);
-	if (gret) {
-		PARA_ERROR_LOG("offset %zu: %s\n", erroff,
-			gcry_strerror(gcry_err_code(gret)));
-		ret = -E_SEXP_BUILD;
-		goto release_e;
-	}
-	key = para_malloc(sizeof(*key));
-	key->sexp = sexp;
-	key->num_bytes = n_size;
-	*result = key;
-	ret = n_size;
-	PARA_INFO_LOG("successfully read %d bit asn public key\n", n_size * 8);
-
-release_e:
-	gcry_mpi_release(e);
-release_n:
-	gcry_mpi_release(n);
-free_blob:
-	free(blob);
-	return ret;
-}
-
 static int get_ssh_public_key(unsigned char *data, int size, gcry_sexp_t *result)
 {
 	int ret;
@@ -546,8 +430,7 @@ free_blob:
 	return ret;
 }
 
-int get_asymmetric_key(const char *key_file, int private,
-		struct asymmetric_key **result)
+int get_public_key(const char *key_file, struct asymmetric_key **result)
 {
 	int ret, ret2;
 	void *map;
@@ -556,17 +439,13 @@ int get_asymmetric_key(const char *key_file, int private,
 	gcry_sexp_t sexp;
 	struct asymmetric_key *key;
 
-	if (private)
-		return get_private_key(key_file, result);
 	ret = mmap_full_file(key_file, O_RDONLY, &map, &map_size, NULL);
 	if (ret < 0)
 		return ret;
 	ret = is_ssh_rsa_key(map, map_size);
 	if (!ret) {
-		ret = para_munmap(map, map_size);
-		if (ret < 0)
-			return ret;
-		return get_asn_public_key(key_file, result);
+		para_munmap(map, map_size);
+		return -E_SSH_PARSE;
 	}
 	start = map + ret;
 	end = map + map_size;
@@ -587,7 +466,7 @@ unmap:
 	return ret;
 }
 
-void free_asymmetric_key(struct asymmetric_key *key)
+void free_public_key(struct asymmetric_key *key)
 {
 	if (!key)
 		return;
@@ -615,7 +494,7 @@ int priv_decrypt(const char *key_file, unsigned char *outbuf,
 	gcry_sexp_t in, out, priv_key;
 	size_t nbytes;
 
-	ret = check_key_file(key_file, true);
+	ret = check_private_key_file(key_file);
 	if (ret < 0)
 		return ret;
 	PARA_INFO_LOG("decrypting %d byte input\n", inlen);
@@ -667,7 +546,8 @@ in_mpi_release:
 key_release:
 	gcry_sexp_release(priv_key);
 free_key:
-	free_asymmetric_key(priv);
+	gcry_sexp_release(priv->sexp);
+	free(priv);
 	return ret;
 }