aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2011-08-21 11:14:57 +0200
committerAndreas Schneider <asn@cryptomilk.org>2011-08-21 11:15:29 +0200
commitc0412619215b124add447c7c53b22b619bcbd659 (patch)
tree4fd7f8773866c56ba8e5fd9913ca5c40981428e6
parenta4b2518761c6b68b8a28ea250d58e7257bce6554 (diff)
downloadlibssh-c0412619215b124add447c7c53b22b619bcbd659.tar.gz
libssh-c0412619215b124add447c7c53b22b619bcbd659.tar.xz
libssh-c0412619215b124add447c7c53b22b619bcbd659.zip
pki: Create a pki private header file.
-rw-r--r--include/libssh/pki.h61
-rw-r--r--include/libssh/pki_priv.h62
-rw-r--r--src/legacy.c1
-rw-r--r--src/pki.c1
-rw-r--r--src/pki_crypto.c1
-rw-r--r--src/pki_gcrypt.c1
6 files changed, 81 insertions, 46 deletions
diff --git a/include/libssh/pki.h b/include/libssh/pki.h
index b0f682b..9b1625c 100644
--- a/include/libssh/pki.h
+++ b/include/libssh/pki.h
@@ -22,11 +22,6 @@
#ifndef PKI_H_
#define PKI_H_
-#define RSA_HEADER_BEGIN "-----BEGIN RSA PRIVATE KEY-----"
-#define RSA_HEADER_END "-----END RSA PRIVATE KEY-----"
-#define DSA_HEADER_BEGIN "-----BEGIN DSA PRIVATE KEY-----"
-#define DSA_HEADER_END "-----END DSA PRIVATE KEY-----"
-
#define SSH_KEY_FLAG_EMPTY 0x0
#define SSH_KEY_FLAG_PUBLIC 0x0001
#define SSH_KEY_FLAG_PRIVATE 0x0002
@@ -60,60 +55,34 @@ struct ssh_signature_struct {
typedef struct ssh_signature_struct *ssh_signature;
-void ssh_pki_log(const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
-
-ssh_signature ssh_signature_new(void);
-void ssh_signature_free(ssh_signature sign);
-
-/* internal pki functions */
-ssh_key pki_key_dup(const ssh_key key, int demote);
-
-enum ssh_keytypes_e pki_privatekey_type_from_string(const char *privkey);
-int pki_pubkey_build_dss(ssh_key key,
- ssh_string p,
- ssh_string q,
- ssh_string g,
- ssh_string pubkey);
-int pki_pubkey_build_rsa(ssh_key key,
- ssh_string e,
- ssh_string n);
-ssh_string pki_publickey_to_blob(const ssh_key key);
-
-
-/* half public ssh pki functions */
+/* SSH Key Functions */
ssh_key ssh_key_dup(const ssh_key key);
void ssh_key_clean (ssh_key key);
-ssh_key ssh_pki_publickey_from_privatekey(const ssh_key privkey);
-
-int ssh_pki_import_pubkey_blob(const ssh_string key_blob,
- ssh_key *pkey);
-
-ssh_string ssh_pki_export_pubkey_blob(const ssh_key key);
+/* SSH Signature Functions */
+ssh_signature ssh_signature_new(void);
+void ssh_signature_free(ssh_signature sign);
int ssh_pki_export_signature_blob(const ssh_signature sign,
ssh_string *sign_blob);
int ssh_pki_import_signature_blob(const ssh_string sig_blob,
const ssh_key pubkey,
ssh_signature *psig);
+
+/* SSH Public Key Functions */
+ssh_string ssh_pki_export_pubkey_blob(const ssh_key key);
+int ssh_pki_import_pubkey_blob(const ssh_string key_blob,
+ ssh_key *pkey);
+
+/* SSH Private Key Functions */
+ssh_key ssh_pki_publickey_from_privatekey(const ssh_key privkey);
+
+/* SSH Signing Functions */
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 */
+/* Temporary functions, to be removed after migration to ssh_key */
ssh_public_key ssh_pki_convert_key_to_publickey(ssh_key key);
ssh_private_key ssh_pki_convert_key_to_privatekey(ssh_key key);
-
-ssh_key pki_private_key_from_base64(const char *b64_key,
- const char *passphrase,
- ssh_auth_callback auth_fn,
- void *auth_data);
-
-ssh_string pki_signature_to_blob(const ssh_signature sign);
-ssh_signature pki_signature_from_blob(const ssh_key pubkey,
- const ssh_string sig_blob,
- enum ssh_keytypes_e type);
-struct signature_struct *pki_do_sign(const ssh_key privatekey,
- const unsigned char *hash);
-
#endif /* PKI_H_ */
diff --git a/include/libssh/pki_priv.h b/include/libssh/pki_priv.h
new file mode 100644
index 0000000..f89bfdf
--- /dev/null
+++ b/include/libssh/pki_priv.h
@@ -0,0 +1,62 @@
+/*
+ * This file is part of the SSH Library
+ *
+ * Copyright (c) 2010 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 PKI_PRIV_H_
+#define PKI_PRIV_H_
+
+#define RSA_HEADER_BEGIN "-----BEGIN RSA PRIVATE KEY-----"
+#define RSA_HEADER_END "-----END RSA PRIVATE KEY-----"
+#define DSA_HEADER_BEGIN "-----BEGIN DSA PRIVATE KEY-----"
+#define DSA_HEADER_END "-----END DSA PRIVATE KEY-----"
+
+void ssh_pki_log(const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
+
+/* SSH Key Functions */
+ssh_key pki_key_dup(const ssh_key key, int demote);
+
+/* SSH Private Key Functions */
+enum ssh_keytypes_e pki_privatekey_type_from_string(const char *privkey);
+ssh_key pki_private_key_from_base64(const char *b64_key,
+ const char *passphrase,
+ ssh_auth_callback auth_fn,
+ void *auth_data);
+
+/* SSH Public Key Functions */
+int pki_pubkey_build_dss(ssh_key key,
+ ssh_string p,
+ ssh_string q,
+ ssh_string g,
+ ssh_string pubkey);
+int pki_pubkey_build_rsa(ssh_key key,
+ ssh_string e,
+ ssh_string n);
+ssh_string pki_publickey_to_blob(const ssh_key key);
+
+/* SSH Signature Functions */
+ssh_string pki_signature_to_blob(const ssh_signature sign);
+ssh_signature pki_signature_from_blob(const ssh_key pubkey,
+ const ssh_string sig_blob,
+ enum ssh_keytypes_e type);
+
+/* SSH Signing Functions */
+struct signature_struct *pki_do_sign(const ssh_key privatekey,
+ const unsigned char *hash);
+#endif /* PKI_PRIV_H_ */
diff --git a/src/legacy.c b/src/legacy.c
index 531feb6..681ed0f 100644
--- a/src/legacy.c
+++ b/src/legacy.c
@@ -31,6 +31,7 @@
#include <libssh/server.h>
#include <libssh/buffer.h>
#include <libssh/pki.h>
+#include "libssh/pki_priv.h"
#include <libssh/keys.h>
#include <libssh/keyfiles.h>
diff --git a/src/pki.c b/src/pki.c
index 542bede..bcfb208 100644
--- a/src/pki.c
+++ b/src/pki.c
@@ -44,6 +44,7 @@
#include "libssh/session.h"
#include "libssh/priv.h"
#include "libssh/pki.h"
+#include "libssh/pki_priv.h"
#include "libssh/keys.h"
#include "libssh/buffer.h"
#include "libssh/misc.h"
diff --git a/src/pki_crypto.c b/src/pki_crypto.c
index f71c22b..33e77c6 100644
--- a/src/pki_crypto.c
+++ b/src/pki_crypto.c
@@ -36,6 +36,7 @@
#include "libssh/session.h"
#include "libssh/callbacks.h"
#include "libssh/pki.h"
+#include "libssh/pki_priv.h"
#include "libssh/keys.h"
#include "libssh/dh.h"
diff --git a/src/pki_gcrypt.c b/src/pki_gcrypt.c
index 3317514..a39b260 100644
--- a/src/pki_gcrypt.c
+++ b/src/pki_gcrypt.c
@@ -56,6 +56,7 @@
#include "libssh/misc.h"
#include "libssh/keys.h"
#include "libssh/pki.h"
+#include "libssh/pki_priv.h"
/*todo: remove this include */
#include "libssh/string.h"