aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2011-08-25 16:26:12 +0200
committerAndreas Schneider <asn@cryptomilk.org>2011-08-25 16:26:12 +0200
commit892cb92f573813121ba6820c382ef8794a9c9c4a (patch)
treed713d0682ec397fcbadf7fdfbac4352113966527
parentc59939d4a2b5673869ad0b72d5cf030edb680635 (diff)
downloadlibssh-892cb92f573813121ba6820c382ef8794a9c9c4a.tar.gz
libssh-892cb92f573813121ba6820c382ef8794a9c9c4a.tar.xz
libssh-892cb92f573813121ba6820c382ef8794a9c9c4a.zip
auth: Prefix kbdint functions.
-rw-r--r--include/libssh/auth.h6
-rw-r--r--src/auth.c131
-rw-r--r--src/messages.c10
-rw-r--r--src/server.c14
4 files changed, 80 insertions, 81 deletions
diff --git a/include/libssh/auth.h b/include/libssh/auth.h
index c2fba2a..a2b3f62 100644
--- a/include/libssh/auth.h
+++ b/include/libssh/auth.h
@@ -46,9 +46,9 @@ struct ssh_kbdint_struct {
};
typedef struct ssh_kbdint_struct* ssh_kbdint;
-ssh_kbdint kbdint_new(void);
-void kbdint_clean(ssh_kbdint kbd);
-void kbdint_free(ssh_kbdint kbd);
+ssh_kbdint ssh_kbdint_new(void);
+void ssh_kbdint_clean(ssh_kbdint kbd);
+void ssh_kbdint_free(ssh_kbdint kbd);
#ifdef WITH_SSH1
diff --git a/src/auth.c b/src/auth.c
index f06149c..d3a5c78 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -1372,84 +1372,83 @@ int ssh_userauth_agent_pubkey(ssh_session session,
}
#endif /* _WIN32 */
-ssh_kbdint kbdint_new(void) {
- ssh_kbdint kbd;
+ssh_kbdint ssh_kbdint_new(void) {
+ ssh_kbdint kbd;
- kbd = malloc(sizeof (struct ssh_kbdint_struct));
- if (kbd == NULL) {
- return NULL;
- }
- ZERO_STRUCTP(kbd);
+ kbd = malloc(sizeof(struct ssh_kbdint_struct));
+ if (kbd == NULL) {
+ return NULL;
+ }
+ ZERO_STRUCTP(kbd);
- return kbd;
+ return kbd;
}
-void kbdint_free(ssh_kbdint kbd) {
- int i, n;
-
- if (kbd == NULL) {
- return;
- }
+void ssh_kbdint_free(ssh_kbdint kbd) {
+ int i, n;
+ if (kbd == NULL) {
+ return;
+ }
- SAFE_FREE(kbd->name);
- SAFE_FREE(kbd->instruction);
- SAFE_FREE(kbd->echo);
+ SAFE_FREE(kbd->name);
+ SAFE_FREE(kbd->instruction);
+ SAFE_FREE(kbd->echo);
- n = kbd->nprompts;
- if (kbd->prompts) {
- for (i = 0; i < n; i++) {
- BURN_STRING(kbd->prompts[i]);
- SAFE_FREE(kbd->prompts[i]);
+ n = kbd->nprompts;
+ if (kbd->prompts) {
+ for (i = 0; i < n; i++) {
+ BURN_STRING(kbd->prompts[i]);
+ SAFE_FREE(kbd->prompts[i]);
+ }
+ SAFE_FREE(kbd->prompts);
}
- SAFE_FREE(kbd->prompts);
- }
- n = kbd->nanswers;
- if (kbd->answers) {
- for (i = 0; i < n; i++) {
- BURN_STRING(kbd->answers[i]);
- SAFE_FREE(kbd->answers[i]);
+ n = kbd->nanswers;
+ if (kbd->answers) {
+ for (i = 0; i < n; i++) {
+ BURN_STRING(kbd->answers[i]);
+ SAFE_FREE(kbd->answers[i]);
+ }
+ SAFE_FREE(kbd->answers);
}
- SAFE_FREE(kbd->answers);
- }
- SAFE_FREE(kbd);
+ SAFE_FREE(kbd);
}
-void kbdint_clean(ssh_kbdint kbd) {
- int i, n;
+void ssh_kbdint_clean(ssh_kbdint kbd) {
+ int i, n;
- if (kbd == NULL) {
- return;
- }
+ if (kbd == NULL) {
+ return;
+ }
- SAFE_FREE(kbd->name);
- SAFE_FREE(kbd->instruction);
- SAFE_FREE(kbd->echo);
+ SAFE_FREE(kbd->name);
+ SAFE_FREE(kbd->instruction);
+ SAFE_FREE(kbd->echo);
- n = kbd->nprompts;
- if (kbd->prompts) {
- for (i = 0; i < n; i++) {
- BURN_STRING(kbd->prompts[i]);
- SAFE_FREE(kbd->prompts[i]);
+ n = kbd->nprompts;
+ if (kbd->prompts) {
+ for (i = 0; i < n; i++) {
+ BURN_STRING(kbd->prompts[i]);
+ SAFE_FREE(kbd->prompts[i]);
+ }
+ SAFE_FREE(kbd->prompts);
}
- SAFE_FREE(kbd->prompts);
- }
- n = kbd->nanswers;
+ n = kbd->nanswers;
- if (kbd->answers) {
- for (i = 0; i < n; i++) {
- BURN_STRING(kbd->answers[i]);
- SAFE_FREE(kbd->answers[i]);
+ if (kbd->answers) {
+ for (i = 0; i < n; i++) {
+ BURN_STRING(kbd->answers[i]);
+ SAFE_FREE(kbd->answers[i]);
+ }
+ SAFE_FREE(kbd->answers);
}
- SAFE_FREE(kbd->answers);
- }
- kbd->nprompts = 0;
- kbd->nanswers = 0;
+ kbd->nprompts = 0;
+ kbd->nanswers = 0;
}
/* this function sends the first packet as explained in section 3.1
@@ -1551,7 +1550,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_info_request) {
ssh_string_free(tmp);
if (session->kbdint == NULL) {
- session->kbdint = kbdint_new();
+ session->kbdint = ssh_kbdint_new();
if (session->kbdint == NULL) {
ssh_set_error_oom(session);
ssh_string_free(name);
@@ -1561,14 +1560,14 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_info_request) {
return SSH_PACKET_USED;
}
} else {
- kbdint_clean(session->kbdint);
+ ssh_kbdint_clean(session->kbdint);
}
session->kbdint->name = ssh_string_to_char(name);
ssh_string_free(name);
if (session->kbdint->name == NULL) {
ssh_set_error_oom(session);
- kbdint_free(session->kbdint);
+ ssh_kbdint_free(session->kbdint);
leave_function();
return SSH_PACKET_USED;
}
@@ -1577,7 +1576,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_info_request) {
ssh_string_free(instruction);
if (session->kbdint->instruction == NULL) {
ssh_set_error_oom(session);
- kbdint_free(session->kbdint);
+ ssh_kbdint_free(session->kbdint);
session->kbdint = NULL;
leave_function();
return SSH_PACKET_USED;
@@ -1589,7 +1588,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_info_request) {
ssh_set_error(session, SSH_FATAL,
"Too much prompt asked from server: %u (0x%.4x)",
nprompts, nprompts);
- kbdint_free(session->kbdint);
+ ssh_kbdint_free(session->kbdint);
session->kbdint = NULL;
leave_function();
return SSH_PACKET_USED;
@@ -1601,7 +1600,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_info_request) {
if (session->kbdint->prompts == NULL) {
session->kbdint->nprompts = 0;
ssh_set_error_oom(session);
- kbdint_free(session->kbdint);
+ ssh_kbdint_free(session->kbdint);
session->kbdint = NULL;
leave_function();
return SSH_PACKET_USED;
@@ -1612,7 +1611,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_info_request) {
if (session->kbdint->echo == NULL) {
session->kbdint->nprompts = 0;
ssh_set_error_oom(session);
- kbdint_free(session->kbdint);
+ ssh_kbdint_free(session->kbdint);
session->kbdint = NULL;
leave_function();
return SSH_PACKET_USED;
@@ -1624,7 +1623,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_info_request) {
buffer_get_u8(packet, &session->kbdint->echo[i]);
if (tmp == NULL) {
ssh_set_error(session, SSH_FATAL, "Short INFO_REQUEST packet");
- kbdint_free(session->kbdint);
+ ssh_kbdint_free(session->kbdint);
session->kbdint = NULL;
leave_function();
return SSH_PACKET_USED;
@@ -1634,7 +1633,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_info_request) {
if (session->kbdint->prompts[i] == NULL) {
ssh_set_error_oom(session);
session->kbdint->nprompts = i;
- kbdint_free(session->kbdint);
+ ssh_kbdint_free(session->kbdint);
session->kbdint = NULL;
leave_function();
return SSH_PACKET_USED;
@@ -1692,7 +1691,7 @@ static int kbdauth_send(ssh_session session) {
ssh_string_free(answer);
}
session->auth_state=SSH_AUTH_STATE_KBDINT_SENT;
- kbdint_free(session->kbdint);
+ ssh_kbdint_free(session->kbdint);
session->kbdint = NULL;
if (packet_send(session) == SSH_ERROR) {
leave_function();
diff --git a/src/messages.c b/src/messages.c
index 94cf79e..1af9a56 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -706,7 +706,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_info_response){
ssh_log(session, SSH_LOG_PROTOCOL, "Warning: Got a keyboard-interactive "
"response but it seems we didn't send the request.");
- session->kbdint = kbdint_new();
+ session->kbdint = ssh_kbdint_new();
if (session->kbdint == NULL) {
ssh_set_error_oom(session);
@@ -721,7 +721,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_info_response){
ssh_set_error(session, SSH_FATAL,
"Too much answers received from client: %u (0x%.4x)",
nanswers, nanswers);
- kbdint_free(session->kbdint);
+ ssh_kbdint_free(session->kbdint);
session->kbdint = NULL;
leave_function();
return SSH_PACKET_USED;
@@ -737,7 +737,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_info_response){
if (session->kbdint->answers == NULL) {
session->kbdint->nanswers = 0;
ssh_set_error_oom(session);
- kbdint_free(session->kbdint);
+ ssh_kbdint_free(session->kbdint);
session->kbdint = NULL;
leave_function();
return SSH_PACKET_USED;
@@ -749,7 +749,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_info_response){
if (tmp == NULL) {
ssh_set_error(session, SSH_FATAL, "Short INFO_RESPONSE packet");
session->kbdint->nanswers = i;
- kbdint_free(session->kbdint);
+ ssh_kbdint_free(session->kbdint);
session->kbdint = NULL;
leave_function();
return SSH_PACKET_USED;
@@ -759,7 +759,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_info_response){
if (session->kbdint->answers[i] == NULL) {
ssh_set_error_oom(session);
session->kbdint->nanswers = i;
- kbdint_free(session->kbdint);
+ ssh_kbdint_free(session->kbdint);
session->kbdint = NULL;
leave_function();
return SSH_PACKET_USED;
diff --git a/src/server.c b/src/server.c
index 6c454f7..e17132f 100644
--- a/src/server.c
+++ b/src/server.c
@@ -845,27 +845,27 @@ int ssh_message_auth_interactive_request(ssh_message msg, const char *name,
"keyboard-interactive response but it "
"seems we didn't send the request.");
- msg->session->kbdint = kbdint_new();
+ msg->session->kbdint = ssh_kbdint_new();
if (msg->session->kbdint == NULL) {
ssh_set_error_oom(msg->session);
return SSH_ERROR;
}
} else {
- kbdint_clean(msg->session->kbdint);
+ ssh_kbdint_clean(msg->session->kbdint);
}
msg->session->kbdint->name = strdup(name);
if(msg->session->kbdint->name == NULL) {
ssh_set_error_oom(msg->session);
- kbdint_free(msg->session->kbdint);
+ ssh_kbdint_free(msg->session->kbdint);
msg->session->kbdint = NULL;
return SSH_PACKET_USED;
}
msg->session->kbdint->instruction = strdup(instruction);
if(msg->session->kbdint->instruction == NULL) {
ssh_set_error_oom(msg->session);
- kbdint_free(msg->session->kbdint);
+ ssh_kbdint_free(msg->session->kbdint);
msg->session->kbdint = NULL;
return SSH_PACKET_USED;
}
@@ -876,14 +876,14 @@ int ssh_message_auth_interactive_request(ssh_message msg, const char *name,
if (msg->session->kbdint->prompts == NULL) {
msg->session->kbdint->nprompts = 0;
ssh_set_error_oom(msg->session);
- kbdint_free(msg->session->kbdint);
+ ssh_kbdint_free(msg->session->kbdint);
msg->session->kbdint = NULL;
return SSH_ERROR;
}
msg->session->kbdint->echo = malloc(num_prompts * sizeof(char));
if (msg->session->kbdint->echo == NULL) {
ssh_set_error_oom(msg->session);
- kbdint_free(msg->session->kbdint);
+ ssh_kbdint_free(msg->session->kbdint);
msg->session->kbdint = NULL;
return SSH_ERROR;
}
@@ -893,7 +893,7 @@ int ssh_message_auth_interactive_request(ssh_message msg, const char *name,
if (msg->session->kbdint->prompts[i] == NULL) {
ssh_set_error_oom(msg->session);
msg->session->kbdint->nprompts = i;
- kbdint_free(msg->session->kbdint);
+ ssh_kbdint_free(msg->session->kbdint);
msg->session->kbdint = NULL;
return SSH_PACKET_USED;
}