From 614ad97c1271328363b5544d7723c00d7d01439b Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 16 Aug 2011 00:55:47 +0200
Subject: [PATCH] pki: Make ssh_type_from_name() a legacy function.

---
 src/keys.c   | 18 ------------------
 src/legacy.c |  5 +++++
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/keys.c b/src/keys.c
index 71c1ac87..a3d772a7 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -44,24 +44,6 @@
  * @{
  */
 
-int ssh_type_from_name(const char *name) {
-  if (strcmp(name, "rsa1") == 0) {
-    return SSH_KEYTYPE_RSA1;
-  } else if (strcmp(name, "rsa") == 0) {
-    return SSH_KEYTYPE_RSA;
-  } else if (strcmp(name, "dsa") == 0) {
-    return SSH_KEYTYPE_DSS;
-  } else if (strcmp(name, "ssh-rsa1") == 0) {
-    return SSH_KEYTYPE_RSA1;
-  } else if (strcmp(name, "ssh-rsa") == 0) {
-    return SSH_KEYTYPE_RSA;
-  } else if (strcmp(name, "ssh-dss") == 0) {
-    return SSH_KEYTYPE_DSS;
-  }
-
-  return -1;
-}
-
 ssh_public_key publickey_make_dss(ssh_session session, ssh_buffer buffer) {
   ssh_string p = NULL;
   ssh_string q = NULL;
diff --git a/src/legacy.c b/src/legacy.c
index 61db4db0..a4804d1d 100644
--- a/src/legacy.c
+++ b/src/legacy.c
@@ -342,6 +342,11 @@ ssh_string publickey_from_file(ssh_session session, const char *filename,
 const char *ssh_type_to_char(int type) {
     return ssh_key_type_to_char(type);
 }
+
+int ssh_type_from_name(const char *name) {
+    return ssh_key_type_from_name(name);
+}
+
 /****************************************************************************
  * SERVER SUPPORT
  ****************************************************************************/