From fe246db27d69e6e27ebde35f6e72e41802ce4a26 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 30 Aug 2011 11:31:45 +0200
Subject: [PATCH] keys: Move publickey_free() to legacy.c.

---
 src/keys.c   | 27 ---------------------------
 src/legacy.c | 30 +++++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/keys.c b/src/keys.c
index 92ddf788..31d9cea5 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -44,33 +44,6 @@
  * @{
  */
 
-void publickey_free(ssh_public_key key) {
-  if (key == NULL) {
-    return;
-  }
-
-  switch(key->type) {
-    case SSH_KEYTYPE_DSS:
-#ifdef HAVE_LIBGCRYPT
-      gcry_sexp_release(key->dsa_pub);
-#elif HAVE_LIBCRYPTO
-      DSA_free(key->dsa_pub);
-#endif
-      break;
-    case SSH_KEYTYPE_RSA:
-    case SSH_KEYTYPE_RSA1:
-#ifdef HAVE_LIBGCRYPT
-      gcry_sexp_release(key->rsa_pub);
-#elif defined HAVE_LIBCRYPTO
-      RSA_free(key->rsa_pub);
-#endif
-      break;
-    default:
-      break;
-  }
-  SAFE_FREE(key);
-}
-
 /**
  * @brief Make a public_key object out of a private_key object.
  *
diff --git a/src/legacy.c b/src/legacy.c
index 66528596..d15508c7 100644
--- a/src/legacy.c
+++ b/src/legacy.c
@@ -300,7 +300,6 @@ int channel_write(ssh_channel channel, const void *data, uint32_t len){
 void privatekey_free(ssh_private_key prv);
 ssh_private_key privatekey_from_file(ssh_session session, const char *filename,
     int type, const char *passphrase);
-void publickey_free(ssh_public_key key);
 int ssh_publickey_to_file(ssh_session session, const char *file,
     ssh_string pubkey, int type);
 ssh_public_key publickey_from_privatekey(ssh_private_key prv);
@@ -344,6 +343,35 @@ char *string_to_char(ssh_string str){
   return ssh_string_to_char(str);
 }
 
+/* OLD PKI FUNCTIONS */
+
+void publickey_free(ssh_public_key key) {
+  if (key == NULL) {
+    return;
+  }
+
+  switch(key->type) {
+    case SSH_KEYTYPE_DSS:
+#ifdef HAVE_LIBGCRYPT
+      gcry_sexp_release(key->dsa_pub);
+#elif HAVE_LIBCRYPTO
+      DSA_free(key->dsa_pub);
+#endif
+      break;
+    case SSH_KEYTYPE_RSA:
+    case SSH_KEYTYPE_RSA1:
+#ifdef HAVE_LIBGCRYPT
+      gcry_sexp_release(key->rsa_pub);
+#elif defined HAVE_LIBCRYPTO
+      RSA_free(key->rsa_pub);
+#endif
+      break;
+    default:
+      break;
+  }
+  SAFE_FREE(key);
+}
+
 ssh_private_key privatekey_from_file(ssh_session session,
                                      const char *filename,
                                      int type,