shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-04 20:30:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert commit 527.

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@529 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-17 18:22:53 +00:00
parent c48d04b2c7
commit a925c266ca
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libssh/keys.c
View File

@@ -248,7 +248,6 @@ void publickey_free(PUBLIC_KEY *key) {
}
PUBLIC_KEY *publickey_from_string(SSH_SESSION *session, STRING *pubkey_s) {
PUBLIC_KEY *key = NULL;
BUFFER *tmpbuf = NULL;
STRING *type_s = NULL;
char *type = NULL;
@@ -277,21 +276,15 @@ PUBLIC_KEY *publickey_from_string(SSH_SESSION *session, STRING *pubkey_s) {
if(strcmp(type, "ssh-dss") == 0) {
SAFE_FREE(type);
key = publickey_make_dss(session, tmpbuf);
buffer_free(tmpbuf);
return key;
return publickey_make_dss(session, tmpbuf);
}
if(strcmp(type,"ssh-rsa") == 0) {
SAFE_FREE(type);
key = publickey_make_rsa(session, tmpbuf,"ssh-rsa");
buffer_free(tmpbuf);
return key;
return publickey_make_rsa(session, tmpbuf,"ssh-rsa");
}
if (strcmp(type,"ssh-rsa1") == 0) {
SAFE_FREE(type);
key = publickey_make_rsa(session, tmpbuf,"ssh-rsa1");
buffer_free(tmpbuf);
return key;
return publickey_make_rsa(session, tmpbuf,"ssh-rsa1");
}
ssh_set_error(session, SSH_FATAL, "Unknown public key protocol %s", type);