aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/libssh/pki.h3
-rw-r--r--src/pki.c59
2 files changed, 0 insertions, 62 deletions
diff --git a/include/libssh/pki.h b/include/libssh/pki.h
index 7aed09a2..be1117d6 100644
--- a/include/libssh/pki.h
+++ b/include/libssh/pki.h
@@ -52,9 +52,6 @@ ssh_string ssh_pki_do_sign(ssh_session session, ssh_buffer sigbuf,
ssh_key privatekey);
/* temporary functions, to be removed after migration to ssh_key */
-ssh_key ssh_pki_convert_privatekey_to_key(ssh_private_key priv);
-ssh_key ssh_pki_convert_publickey_to_key(ssh_public_key pub);
-ssh_private_key ssh_pki_convert_key_to_privatekey(ssh_key key);
ssh_public_key ssh_pki_convert_key_to_publickey(ssh_key key);
diff --git a/src/pki.c b/src/pki.c
index b6ce9ca7..d03bd927 100644
--- a/src/pki.c
+++ b/src/pki.c
@@ -120,65 +120,6 @@ int ssh_key_import_private(ssh_key key, ssh_session session, const char *filenam
}
/* temporary function to migrate seemlessly to ssh_key */
-ssh_key ssh_pki_convert_privatekey_to_key(ssh_private_key priv) {
- ssh_key key;
-
- if(priv == NULL) {
- return NULL;
- }
-
- key = ssh_key_new();
-
- key->dsa = priv->dsa_priv;
- key->rsa = priv->rsa_priv;
- key->type = priv->type;
- key->flags = SSH_KEY_FLAG_PRIVATE;
- key->type_c = ssh_type_to_char(key->type);
-
- return SSH_OK;
-}
-
-/* temporary function to migrate seemlessly to ssh_key */
-ssh_key ssh_pki_convert_publickey_to_key(ssh_public_key pub) {
- ssh_key key;
-
- if(pub == NULL) {
- return NULL;
- }
-
- key = ssh_key_new();
-
- key->dsa = pub->dsa_pub;
- key->rsa = pub->rsa_pub;
- key->type = pub->type;
- key->flags = SSH_KEY_FLAG_PUBLIC;
- key->type_c = ssh_type_to_char(key->type);
-
- return SSH_OK;
-}
-
-/* temporary function to migrate seemlessly to ssh_key */
-ssh_private_key ssh_pki_convert_key_to_privatekey(ssh_key key) {
- ssh_private_key priv;
-
- if(key == NULL) {
- return NULL;
- }
-
- priv = malloc(sizeof(struct ssh_private_key_struct));
- if (priv == NULL) {
- return NULL;
- }
- ZERO_STRUCTP(priv);
-
- priv->dsa_priv = key->dsa;
- priv->rsa_priv = key->rsa;
- priv->type = key->type;
-
- return priv;
-}
-
-/* temporary function to migrate seemlessly to ssh_key */
ssh_public_key ssh_pki_convert_key_to_publickey(ssh_key key) {
ssh_public_key pub;