diff --git a/pageant.c b/pageant.c
index 41a0c4ff..170655d8 100644
--- a/pageant.c
+++ b/pageant.c
@@ -1073,7 +1073,7 @@ int pageant_add_keyfile(Filename *filename, const char *passphrase,
 		}
 		/* Now skip over public blob */
 		if (type == SSH_KEYTYPE_SSH1) {
-		    int n = rsa_public_blob_len(p, keylistlen);
+		    int n = rsa_ssh1_public_blob_len(p, keylistlen);
 		    if (n < 0) {
                         *retstr = dupstr("Received broken key list from agent");
                         sfree(keylist);
diff --git a/ssh.h b/ssh.h
index d4ca6584..ec32d1df 100644
--- a/ssh.h
+++ b/ssh.h
@@ -196,7 +196,7 @@ char *rsa_ssh1_fingerprint(struct RSAKey *key);
 int rsa_verify(struct RSAKey *key);
 void rsa_ssh1_public_blob(BinarySink *bs, struct RSAKey *key,
                           RsaSsh1Order order);
-int rsa_public_blob_len(void *data, int maxlen);
+int rsa_ssh1_public_blob_len(void *data, int maxlen);
 void freersakey(struct RSAKey *key);
 
 typedef uint32 word32;
diff --git a/sshrsa.c b/sshrsa.c
index 2aaaf2d3..598894e1 100644
--- a/sshrsa.c
+++ b/sshrsa.c
@@ -441,8 +441,8 @@ void rsa_ssh1_public_blob(BinarySink *bs, struct RSAKey *key,
     }
 }
 
-/* Given a public blob, determine its length. */
-int rsa_public_blob_len(void *data, int maxlen)
+/* Given an SSH-1 public key blob, determine its length. */
+int rsa_ssh1_public_blob_len(void *data, int maxlen)
 {
     BinarySource src[1];