shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-06 18:29:50 +09:00
Code Issues Packages Projects Releases Wiki Activity

pki: Use a consistent naming scheme.

Browse Source
This commit is contained in:
Andreas Schneider
2011-08-19 11:14:23 +02:00
parent 3e56ac650c
commit c575de17a8
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/legacy.c
View File

@@ -355,7 +355,7 @@ ssh_string publickey_from_file(ssh_session session, const char *filename,
return NULL;
}
key_str = ssh_pki_publickey_to_blob(key);
key_str = ssh_pki_export_pubkey_blob(key);
if (key_str == NULL) {
return NULL;
}
@@ -420,7 +420,7 @@ ssh_string publickey_to_string(ssh_public_key pubkey) {
key->dsa = pubkey->dsa_pub;
key->rsa = pubkey->rsa_pub;
key_blob = ssh_pki_publickey_to_blob(key);
key_blob = ssh_pki_export_pubkey_blob(key);
key->dsa = NULL;
key->rsa = NULL;

16
src/pki.c
View File

@@ -710,13 +710,13 @@ ssh_key ssh_pki_publickey_from_privatekey(const ssh_key privkey) {
*
* @return The key_blob or NULL on error.
*/
ssh_string ssh_pki_publickey_to_blob(const ssh_key key)
ssh_string ssh_pki_export_pubkey_blob(const ssh_key key)
{
if (key == NULL) {
return NULL;
}
return pki_publickey_to_string(key);
return pki_publickey_to_blob(key);
}
/**
@@ -730,8 +730,8 @@ ssh_string ssh_pki_publickey_to_blob(const ssh_key key)
*
* @see ssh_string_free_char()
*/
int ssh_pki_export_publickey_base64(const ssh_key key,
char **b64_key)
int ssh_pki_export_pubkey_base64(const ssh_key key,
char **b64_key)
{
ssh_string key_blob;
unsigned char *b64;
@@ -740,7 +740,7 @@ int ssh_pki_export_publickey_base64(const ssh_key key,
return SSH_ERROR;
}
key_blob = pki_publickey_to_string(key);
key_blob = pki_publickey_to_blob(key);
if (key_blob == NULL) {
return SSH_ERROR;
}
@@ -756,8 +756,8 @@ int ssh_pki_export_publickey_base64(const ssh_key key,
return SSH_OK;
}
int ssh_pki_export_publickey_file(const ssh_key key,
const char *filename)
int ssh_pki_export_pubkey_file(const ssh_key key,
const char *filename)
{
char key_buf[4096];
char host[256];
@@ -781,7 +781,7 @@ int ssh_pki_export_publickey_file(const ssh_key key,
return SSH_ERROR;
}
rc = ssh_pki_export_publickey_base64(key, &b64_key);
rc = ssh_pki_export_pubkey_base64(key, &b64_key);
if (rc < 0) {
free(user);
return SSH_ERROR;

2
src/pki_crypto.c
View File

@@ -350,7 +350,7 @@ int pki_pubkey_build_rsa(ssh_key key,
return SSH_OK;
}
ssh_string pki_publickey_to_string(const ssh_key key)
ssh_string pki_publickey_to_blob(const ssh_key key)
{
ssh_buffer buffer;
ssh_string type_s;

2
src/pki_gcrypt.c
View File

@@ -985,7 +985,7 @@ fail:
return NULL;
}
ssh_string pki_publickey_to_string(const ssh_key key)
ssh_string pki_publickey_to_blob(const ssh_key key)
{
ssh_buffer buffer;
ssh_string type_s;