shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-12 11:10:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

agent: Use new pki functions.

Browse Source
This commit is contained in:
Andreas Schneider
2011-08-13 12:21:23 +02:00
parent 0523adf95c
commit 481522cf63
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/agent.c
View File

@@ -54,6 +54,7 @@
#include "libssh/session.h" #include "libssh/session.h"
#include "libssh/keys.h" #include "libssh/keys.h"
#include "libssh/poll.h" #include "libssh/poll.h"
#include "libssh/pki.h"
/* macro to check for "agent failure" message */ /* macro to check for "agent failure" message */
#define agent_failed(x) \ #define agent_failed(x) \
@@ -348,9 +349,10 @@ struct ssh_public_key_struct *agent_get_first_ident(struct ssh_session_struct *s
/* caller has to free commment */ /* caller has to free commment */
struct ssh_public_key_struct *agent_get_next_ident(struct ssh_session_struct *session, struct ssh_public_key_struct *agent_get_next_ident(struct ssh_session_struct *session,
char **comment) { char **comment) {
struct ssh_public_key_struct *pubkey = NULL; struct ssh_key_struct *key;
struct ssh_string_struct *blob = NULL; struct ssh_string_struct *blob = NULL;
struct ssh_string_struct *tmp = NULL; struct ssh_string_struct *tmp = NULL;
int rc;
if (session->agent->count == 0) { if (session->agent->count == 0) {
return NULL; return NULL;
@@ -385,14 +387,17 @@ struct ssh_public_key_struct *agent_get_next_ident(struct ssh_session_struct *se
ssh_string_free(tmp); ssh_string_free(tmp);
/* get key from blob */ /* get key from blob */
pubkey = publickey_from_string(session, blob); rc = ssh_pki_import_pubkey_string(session, blob, &key);
ssh_string_free(blob); ssh_string_free(blob);
if (rc == SSH_ERROR) {
return NULL;
}
break; break;
default: default:
return NULL; return NULL;
} }
return pubkey; return ssh_pki_convert_key_to_publickey(key);
} }
ssh_string agent_sign_data(struct ssh_session_struct *session, ssh_string agent_sign_data(struct ssh_session_struct *session,