diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2011-08-16 00:55:47 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2011-08-16 00:55:47 +0200 |
commit | 614ad97c1271328363b5544d7723c00d7d01439b (patch) | |
tree | 9b1b8a2d2bf52dd3fe3032a0a8ef0eea6eff5ab0 | |
parent | 04ce7967b8372c848d84e3e646b02eb28b1d8acd (diff) | |
download | libssh-614ad97c1271328363b5544d7723c00d7d01439b.tar.gz libssh-614ad97c1271328363b5544d7723c00d7d01439b.tar.xz libssh-614ad97c1271328363b5544d7723c00d7d01439b.zip |
pki: Make ssh_type_from_name() a legacy function.
-rw-r--r-- | src/keys.c | 18 | ||||
-rw-r--r-- | src/legacy.c | 5 |
2 files changed, 5 insertions, 18 deletions
@@ -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 61db4db..a4804d1 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 ****************************************************************************/ |