lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-30 13:01:23 +03:00
Code Activity

agent: Return uint32_t for ssh_agent_get_ident_count()

Browse Source 
Fixes T188

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Andreas Schneider
2019-10-31 16:06:06 +01:00
parent c820d2a2dc
commit 1be68139bb
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libssh/agent.h
View File

@@ -104,7 +104,7 @@ void ssh_agent_free(struct ssh_agent_struct *agent);
*/ */
int ssh_agent_is_running(struct ssh_session_struct *session); int ssh_agent_is_running(struct ssh_session_struct *session);
int ssh_agent_get_ident_count(struct ssh_session_struct *session); uint32_t ssh_agent_get_ident_count(struct ssh_session_struct *session);
ssh_key ssh_agent_get_next_ident(struct ssh_session_struct *session, ssh_key ssh_agent_get_next_ident(struct ssh_session_struct *session,
char **comment); char **comment);

16
src/agent.c
View File

@@ -307,7 +307,7 @@ static int agent_talk(struct ssh_session_struct *session,
return 0; return 0;
} }
int ssh_agent_get_ident_count(struct ssh_session_struct *session) uint32_t ssh_agent_get_ident_count(struct ssh_session_struct *session)
{ {
ssh_buffer request = NULL; ssh_buffer request = NULL;
ssh_buffer reply = NULL; ssh_buffer reply = NULL;
@@ -319,19 +319,19 @@ int ssh_agent_get_ident_count(struct ssh_session_struct *session)
request = ssh_buffer_new(); request = ssh_buffer_new();
if (request == NULL) { if (request == NULL) {
ssh_set_error_oom(session); ssh_set_error_oom(session);
return -1; return 0;
} }
if (ssh_buffer_add_u8(request, SSH2_AGENTC_REQUEST_IDENTITIES) < 0) { if (ssh_buffer_add_u8(request, SSH2_AGENTC_REQUEST_IDENTITIES) < 0) {
ssh_set_error_oom(session); ssh_set_error_oom(session);
ssh_buffer_free(request); ssh_buffer_free(request);
return -1; return 0;
} }
reply = ssh_buffer_new(); reply = ssh_buffer_new();
if (reply == NULL) { if (reply == NULL) {
ssh_buffer_free(request); ssh_buffer_free(request);
ssh_set_error(session, SSH_FATAL, "Not enough space"); ssh_set_error(session, SSH_FATAL, "Not enough space");
return -1; return 0;
} }
if (agent_talk(session, request, reply) < 0) { if (agent_talk(session, request, reply) < 0) {
@@ -347,7 +347,7 @@ int ssh_agent_get_ident_count(struct ssh_session_struct *session)
ssh_set_error(session, SSH_FATAL, ssh_set_error(session, SSH_FATAL,
"Bad authentication reply size: %d", rc); "Bad authentication reply size: %d", rc);
ssh_buffer_free(reply); ssh_buffer_free(reply);
return -1; return 0;
} }
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
type = bswap_32(type); type = bswap_32(type);
@@ -364,7 +364,7 @@ int ssh_agent_get_ident_count(struct ssh_session_struct *session)
ssh_set_error(session, SSH_FATAL, ssh_set_error(session, SSH_FATAL,
"Bad authentication reply message type: %u", type); "Bad authentication reply message type: %u", type);
ssh_buffer_free(reply); ssh_buffer_free(reply);
return -1; return 0;
} }
rc = ssh_buffer_get_u32(reply, &count); rc = ssh_buffer_get_u32(reply, &count);
@@ -373,7 +373,7 @@ int ssh_agent_get_ident_count(struct ssh_session_struct *session)
SSH_FATAL, SSH_FATAL,
"Failed to read count"); "Failed to read count");
ssh_buffer_free(reply); ssh_buffer_free(reply);
return -1; return 0;
} }
session->agent->count = ntohl(count); session->agent->count = ntohl(count);
SSH_LOG(SSH_LOG_DEBUG, "Agent count: %d", SSH_LOG(SSH_LOG_DEBUG, "Agent count: %d",
@@ -383,7 +383,7 @@ int ssh_agent_get_ident_count(struct ssh_session_struct *session)
"Too many identities in authentication reply: %d", "Too many identities in authentication reply: %d",
session->agent->count); session->agent->count);
ssh_buffer_free(reply); ssh_buffer_free(reply);
return -1; return 0;
} }
if (session->agent->ident) { if (session->agent->ident) {