diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2011-08-28 14:26:40 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2011-08-28 14:26:40 +0200 |
commit | 5cf23522de543153fc0abcb4d33be1c1115a7aef (patch) | |
tree | 6933736ba9b19acdc74e20a13d4aadc620a97b7b | |
parent | be660e801a517a6b4c89bc30a84cad463eb2de7c (diff) | |
download | libssh-5cf23522de543153fc0abcb4d33be1c1115a7aef.tar.gz libssh-5cf23522de543153fc0abcb4d33be1c1115a7aef.tar.xz libssh-5cf23522de543153fc0abcb4d33be1c1115a7aef.zip |
keyfiles: Remove keyfiles.h.
-rw-r--r-- | include/libssh/keyfiles.h | 30 | ||||
-rw-r--r-- | src/auth.c | 1 | ||||
-rw-r--r-- | src/legacy.c | 6 | ||||
-rw-r--r-- | src/pki_gcrypt.c | 1 | ||||
-rw-r--r-- | src/server.c | 1 |
5 files changed, 0 insertions, 39 deletions
diff --git a/include/libssh/keyfiles.h b/include/libssh/keyfiles.h deleted file mode 100644 index 4f595f00..00000000 --- a/include/libssh/keyfiles.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of the SSH Library - * - * Copyright (c) 2009 by Aris Adamantiadis - * - * The SSH Library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or (at your - * option) any later version. - * - * The SSH Library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with the SSH Library; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. - */ - -#ifndef KEYFILES_H_ -#define KEYFILES_H_ - -/* in keyfiles.c */ - -ssh_private_key _privatekey_from_file(void *session, const char *filename, - int type); - -#endif /* KEYFILES_H_ */ @@ -34,7 +34,6 @@ #include "libssh/ssh2.h" #include "libssh/buffer.h" #include "libssh/agent.h" -#include "libssh/keyfiles.h" #include "libssh/misc.h" #include "libssh/packet.h" #include "libssh/session.h" diff --git a/src/legacy.c b/src/legacy.c index ac98478c..f99551af 100644 --- a/src/legacy.c +++ b/src/legacy.c @@ -37,7 +37,6 @@ #include "libssh/pki_priv.h" #include <libssh/misc.h> #include <libssh/keys.h> -#include <libssh/keyfiles.h> /* AUTH FUNCTIONS */ int ssh_auth_list(ssh_session session) { @@ -390,11 +389,6 @@ ssh_private_key privatekey_from_file(ssh_session session, return privkey; } -ssh_private_key _privatekey_from_file(void *session, const char *filename, - int type) { - return privatekey_from_file(session, filename, type, NULL); -} - enum ssh_keytypes_e ssh_privatekey_type(ssh_private_key privatekey){ if (privatekey==NULL) return SSH_KEYTYPE_UNKNOWN; diff --git a/src/pki_gcrypt.c b/src/pki_gcrypt.c index cd89a6a5..1e3f1eff 100644 --- a/src/pki_gcrypt.c +++ b/src/pki_gcrypt.c @@ -50,7 +50,6 @@ #include "libssh/priv.h" #include "libssh/buffer.h" -#include "libssh/keyfiles.h" #include "libssh/session.h" #include "libssh/wrapper.h" #include "libssh/misc.h" diff --git a/src/server.c b/src/server.c index e17132f8..9de93adc 100644 --- a/src/server.c +++ b/src/server.c @@ -48,7 +48,6 @@ #include "libssh/libssh.h" #include "libssh/server.h" #include "libssh/ssh2.h" -#include "libssh/keyfiles.h" #include "libssh/buffer.h" #include "libssh/packet.h" #include "libssh/socket.h" |