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

Change variable names of the keys_struct to avoid conflicts.

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@753 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-05-11 09:24:39 +00:00
parent f29e119c25
commit 2934765c76
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/libssh/priv.h
View File

@@ -300,8 +300,8 @@ struct agent_struct {
}; };
struct keys_struct { struct keys_struct {
const char *private; const char *privatekey;
const char *public; const char *publickey;
}; };
struct ssh_session { struct ssh_session {

36
libssh/auth.c
View File

@@ -749,20 +749,20 @@ error:
static struct keys_struct keytab[] = { static struct keys_struct keytab[] = {
{ {
.private = "%s/.ssh/identity", .privatekey = "%s/.ssh/identity",
.public = "%s/.ssh/identity.pub" .publickey = "%s/.ssh/identity.pub"
}, },
{ {
.private = "%s/.ssh/id_dsa", .privatekey = "%s/.ssh/id_dsa",
.public = "%s/.ssh/id_dsa.pub", .publickey = "%s/.ssh/id_dsa.pub",
}, },
{ {
.private = "%s/.ssh/id_rsa", .privatekey = "%s/.ssh/id_rsa",
.public = "%s/.ssh/id_rsa.pub", .publickey = "%s/.ssh/id_rsa.pub",
}, },
{ {
.private = NULL, .privatekey = NULL,
.public = NULL .publickey = NULL
} }
}; };
@@ -890,8 +890,8 @@ int ssh_userauth_autopubkey(SSH_SESSION *session, const char *passphrase) {
} }
sprintf(id, "%s.pub", session->options->identity); sprintf(id, "%s.pub", session->options->identity);
keytab[size - 1].private = session->options->identity; keytab[size - 1].privatekey = session->options->identity;
keytab[size - 1].public = id; keytab[size - 1].publickey = id;
} }
for (i = 0, pubkey = try_publickey_from_file(session, keytab[i], for (i = 0, pubkey = try_publickey_from_file(session, keytab[i],
@@ -906,8 +906,8 @@ int ssh_userauth_autopubkey(SSH_SESSION *session, const char *passphrase) {
rc = ssh_userauth_offer_pubkey(session, NULL, type, pubkey); rc = ssh_userauth_offer_pubkey(session, NULL, type, pubkey);
if (rc == SSH_AUTH_ERROR){ if (rc == SSH_AUTH_ERROR){
if (id != NULL) { if (id != NULL) {
keytab[size - 1].private = NULL; keytab[size - 1].privatekey = NULL;
keytab[size - 1].public = NULL; keytab[size - 1].publickey = NULL;
SAFE_FREE(id); SAFE_FREE(id);
} }
string_free(pubkey); string_free(pubkey);
@@ -941,8 +941,8 @@ int ssh_userauth_autopubkey(SSH_SESSION *session, const char *passphrase) {
rc = ssh_userauth_pubkey(session, NULL, pubkey, privkey); rc = ssh_userauth_pubkey(session, NULL, pubkey, privkey);
if (rc == SSH_AUTH_ERROR) { if (rc == SSH_AUTH_ERROR) {
if (id != NULL) { if (id != NULL) {
keytab[size - 1].private = NULL; keytab[size - 1].privatekey = NULL;
keytab[size - 1].public = NULL; keytab[size - 1].publickey = NULL;
SAFE_FREE(id); SAFE_FREE(id);
} }
string_free(pubkey); string_free(pubkey);
@@ -970,8 +970,8 @@ int ssh_userauth_autopubkey(SSH_SESSION *session, const char *passphrase) {
privatekey_free(privkey); privatekey_free(privkey);
SAFE_FREE(privkeyfile); SAFE_FREE(privkeyfile);
if (id != NULL) { if (id != NULL) {
keytab[size - 1].private = NULL; keytab[size - 1].privatekey = NULL;
keytab[size - 1].public = NULL; keytab[size - 1].publickey = NULL;
SAFE_FREE(id); SAFE_FREE(id);
} }
@@ -983,8 +983,8 @@ int ssh_userauth_autopubkey(SSH_SESSION *session, const char *passphrase) {
"Tried every public key, none matched"); "Tried every public key, none matched");
ssh_set_error(session,SSH_NO_ERROR,"No public key matched"); ssh_set_error(session,SSH_NO_ERROR,"No public key matched");
if (id) { if (id) {
keytab[size - 1].private = NULL; keytab[size - 1].privatekey = NULL;
keytab[size - 1].public = NULL; keytab[size - 1].publickey = NULL;
SAFE_FREE(id); SAFE_FREE(id);
} }

4
libssh/keyfiles.c
View File

@@ -938,11 +938,11 @@ STRING *try_publickey_from_file(SSH_SESSION *session, struct keys_struct keytab,
} }
} }
pub = keytab.public; pub = keytab.publickey;
if (pub == NULL) { if (pub == NULL) {
return NULL; return NULL;
} }
priv = keytab.private; priv = keytab.privatekey;
if (priv == NULL) { if (priv == NULL) {
return NULL; return NULL;
} }