summaryrefslogtreecommitdiff
path: root/src/pluto/keys.h
diff options
context:
space:
mode:
authorRene Mayrhofer <rene@mayrhofer.eu.org>2010-08-09 09:43:35 +0000
committerRene Mayrhofer <rene@mayrhofer.eu.org>2010-08-09 09:43:35 +0000
commit9e7fb8577802de2abf191d783be5b6b953c22271 (patch)
treee6818532d3a85a8a840652f6dfc0d58d42c89a69 /src/pluto/keys.h
parent20e652eab94f898365fdde046ed11a2dda2f165e (diff)
downloadvyos-strongswan-9e7fb8577802de2abf191d783be5b6b953c22271.tar.gz
vyos-strongswan-9e7fb8577802de2abf191d783be5b6b953c22271.zip
New upstream release.
Diffstat (limited to 'src/pluto/keys.h')
-rw-r--r--src/pluto/keys.h17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/pluto/keys.h b/src/pluto/keys.h
index d856c0009..73cc21392 100644
--- a/src/pluto/keys.h
+++ b/src/pluto/keys.h
@@ -21,6 +21,7 @@
#include <credentials/keys/public_key.h>
#include "certs.h"
+#include "connections.h"
#ifndef SHARED_SECRETS_FILE
# define SHARED_SECRETS_FILE IPSEC_CONFDIR "/ipsec.secrets"
@@ -31,20 +32,12 @@ const char *shared_secrets_file;
extern void load_preshared_secrets(int whackfd);
extern void free_preshared_secrets(void);
-enum PrivateKeyKind {
- PPK_PSK,
- PPK_PUBKEY,
- PPK_XAUTH,
- PPK_PIN
-};
-
extern void xauth_defaults(void);
-/* forward declaration */
-struct connection;
-
-extern const chunk_t *get_preshared_secret(const struct connection *c);
-extern private_key_t *get_private_key(const struct connection *c);
+extern bool get_xauth_secret(identification_t *user, identification_t *server,
+ chunk_t *secret);
+extern const chunk_t *get_preshared_secret(const connection_t *c);
+extern private_key_t *get_private_key(const connection_t *c);
extern private_key_t *get_x509_private_key(const cert_t *cert);
/* public key machinery */