X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gcrypt.c;h=8431cc24c5a8d44f339937bb1f1aefb1a5c0bb42;hb=3e0533843c8d4add881a6c2d383bd2c80129e27b;hp=5d151a3cc9f7c42e6322f1748902b14281b49f1c;hpb=3f6b7dd0ed39f7008ec09def9239f379b87cd7c1;p=paraslash.git

diff --git a/gcrypt.c b/gcrypt.c
index 5d151a3c..8431cc24 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -111,7 +111,7 @@ static const char *gcrypt_strerror(gcry_error_t gret)
 /** 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,
+static int decode_private_key(const char *key_file, unsigned char **result,
 		size_t *blob_size)
 {
 	int ret, ret2, i, j;
@@ -368,7 +368,7 @@ static int get_private_key(const char *key_file, struct asymmetric_key **result)
 	struct asymmetric_key *key;
 
 	*result = NULL;
-	ret = decode_key(key_file, &blob, &blob_size);
+	ret = decode_private_key(key_file, &blob, &blob_size);
 	if (ret < 0)
 		return ret;
 	end = blob + blob_size;
@@ -426,7 +426,7 @@ int apc_get_pubkey(const char *key_file, struct asymmetric_key **result)
 	struct asymmetric_key *key;
 	unsigned bits;
 
-	ret = decode_ssh_key(key_file, &blob, &decoded_size);
+	ret = decode_public_key(key_file, &blob, &decoded_size);
 	if (ret < 0)
 		return ret;
 	p = blob + ret;