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

options: Use ssh_key_type_e in ssh_options_set_algo()

Browse Source 
Review with 'git show -b'

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider
2017-08-24 17:44:33 +02:00
parent 6803c2f86d
commit 4c602f2255
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/libssh/options.h
View File

@@ -22,7 +22,9 @@
#define _OPTIONS_H
int ssh_config_parse_file(ssh_session session, const char *filename);
int ssh_options_set_algo(ssh_session session, int algo, const char *list);
int ssh_options_set_algo(ssh_session session,
enum ssh_kex_types_e algo,
const char *list);
int ssh_options_apply(ssh_session session);
#endif /* _OPTIONS_H */

28
src/options.c
View File

@@ -162,22 +162,24 @@ int ssh_options_copy(ssh_session src, ssh_session *dest) {
return 0;
}
int ssh_options_set_algo(ssh_session session, int algo,
const char *list) {
char *p = NULL;
int ssh_options_set_algo(ssh_session session,
enum ssh_kex_types_e algo,
const char *list)
{
char *p = NULL;
p = ssh_keep_known_algos(algo, list);
if (p == NULL) {
ssh_set_error(session, SSH_REQUEST_DENIED,
"Setting method: no algorithm for method \"%s\" (%s)",
ssh_kex_get_description(algo), list);
return -1;
}
p = ssh_keep_known_algos(algo, list);
if (p == NULL) {
ssh_set_error(session, SSH_REQUEST_DENIED,
"Setting method: no algorithm for method \"%s\" (%s)",
ssh_kex_get_description(algo), list);
return -1;
}
SAFE_FREE(session->opts.wanted_methods[algo]);
session->opts.wanted_methods[algo] = p;
SAFE_FREE(session->opts.wanted_methods[algo]);
session->opts.wanted_methods[algo] = p;
return 0;
return 0;
}
/**