lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-08 19:02:06 +03:00
Code Activity

pki: Fix and rename ssh_pki_publickey_to_base64().

Browse Source 
Rename it to ssh_pki_export_publickey_base64().
This commit is contained in:
Andreas Schneider
2011-08-16 22:15:05 +02:00
parent 254c30be2e
commit 1a0fbedc2e
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/libssh/libssh.h
View File

@@ -457,9 +457,8 @@ LIBSSH_API int ssh_pki_import_pubkey_base64(const char *b64_key,
ssh_key *pkey); ssh_key *pkey);
LIBSSH_API int ssh_pki_import_pubkey_file(const char *filename, LIBSSH_API int ssh_pki_import_pubkey_file(const char *filename,
ssh_key *pkey); ssh_key *pkey);
LIBSSH_API int ssh_pki_publickey_to_base64(const ssh_key key, LIBSSH_API int ssh_pki_export_publickey_base64(const ssh_key key,
unsigned char **b64_key, char **b64_key);
enum ssh_keytypes_e *ptype);
LIBSSH_API int ssh_userauth_pki_pubkey(ssh_session session, const char *username, LIBSSH_API int ssh_userauth_pki_pubkey(ssh_session session, const char *username,
ssh_string publickey, ssh_key privatekey); ssh_string publickey, ssh_key privatekey);

14
src/pki.c
View File

@@ -725,19 +725,17 @@ ssh_string ssh_pki_publickey_to_blob(const ssh_key key)
* *
* @param[out] b64_key A pointer to store the base64 hased key. * @param[out] b64_key A pointer to store the base64 hased key.
* *
* @param[out] ptype The type of the key.
*
* @return SSH_OK on success, SSH_ERROR on error. * @return SSH_OK on success, SSH_ERROR on error.
* *
* @see ssh_string_free_char() * @see ssh_string_free_char()
*/ */
int ssh_pki_publickey_to_base64(const ssh_key key, unsigned char **b64_key, int ssh_pki_export_publickey_base64(const ssh_key key,
enum ssh_keytypes_e *ptype) char **b64_key)
{ {
ssh_string key_str; ssh_string key_str;
unsigned char *b64; unsigned char *b64;
if (key == NULL || b64_key == NULL || ptype == NULL) { if (key == NULL || b64_key == NULL) {
return SSH_ERROR; return SSH_ERROR;
} }
@@ -748,9 +746,11 @@ int ssh_pki_publickey_to_base64(const ssh_key key, unsigned char **b64_key,
b64 = bin_to_base64(ssh_string_data(key_str), ssh_string_len(key_str)); b64 = bin_to_base64(ssh_string_data(key_str), ssh_string_len(key_str));
ssh_string_free(key_str); ssh_string_free(key_str);
if (b64 == NULL) {
return SSH_ERROR;
}
*ptype = key->type; *b64_key = (char *)b64;
*b64_key = b64;
return SSH_OK; return SSH_OK;
} }

10
tests/unittests/torture_pki.c
View File

@@ -264,9 +264,8 @@ static void torture_pki_publickey_dsa_base64(void **state)
{ {
ssh_session session = *state; ssh_session session = *state;
enum ssh_keytypes_e type; enum ssh_keytypes_e type;
char *key_buf, *p; char *b64_key, *key_buf, *p;
const char *q; const char *q;
unsigned char *b64_key;
ssh_key key; ssh_key key;
int rc; int rc;
@@ -287,7 +286,7 @@ static void torture_pki_publickey_dsa_base64(void **state)
rc = ssh_pki_import_pubkey_base64(q, type, &key); rc = ssh_pki_import_pubkey_base64(q, type, &key);
assert_true(rc == 0); assert_true(rc == 0);
rc = ssh_pki_publickey_to_base64(key, &b64_key, &type); rc = ssh_pki_export_publickey_base64(key, &b64_key);
assert_true(rc == 0); assert_true(rc == 0);
assert_string_equal(q, b64_key); assert_string_equal(q, b64_key);
@@ -301,9 +300,8 @@ static void torture_pki_publickey_rsa_base64(void **state)
{ {
ssh_session session = *state; ssh_session session = *state;
enum ssh_keytypes_e type; enum ssh_keytypes_e type;
char *key_buf, *p; char *b64_key, *key_buf, *p;
const char *q; const char *q;
unsigned char *b64_key;
ssh_key key; ssh_key key;
int rc; int rc;
@@ -325,7 +323,7 @@ static void torture_pki_publickey_rsa_base64(void **state)
rc = ssh_pki_import_pubkey_base64(q, type, &key); rc = ssh_pki_import_pubkey_base64(q, type, &key);
assert_true(rc == 0); assert_true(rc == 0);
rc = ssh_pki_publickey_to_base64(key, &b64_key, &type); rc = ssh_pki_export_publickey_base64(key, &b64_key);
assert_true(rc == 0); assert_true(rc == 0);
assert_string_equal(q, b64_key); assert_string_equal(q, b64_key);