diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2013-11-01 13:32:07 +0100 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2013-11-01 13:32:07 +0100 |
| commit | 5313d2d78ca150515f7f5eb39801c100690b6b29 (patch) | |
| tree | c78e420367283bb1b16f14210b12687cdfbd26eb /src/libstrongswan/credentials | |
| parent | 6b99c8d9cff7b3e8ae8f3204b99e7ea40f791349 (diff) | |
| download | vyos-strongswan-5313d2d78ca150515f7f5eb39801c100690b6b29.tar.gz vyos-strongswan-5313d2d78ca150515f7f5eb39801c100690b6b29.zip | |
Imported Upstream version 5.1.1
Diffstat (limited to 'src/libstrongswan/credentials')
| -rw-r--r-- | src/libstrongswan/credentials/builder.c | 1 | ||||
| -rw-r--r-- | src/libstrongswan/credentials/builder.h | 2 | ||||
| -rw-r--r-- | src/libstrongswan/credentials/cred_encoding.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/libstrongswan/credentials/builder.c b/src/libstrongswan/credentials/builder.c index 6710dfb54..4e52272a7 100644 --- a/src/libstrongswan/credentials/builder.c +++ b/src/libstrongswan/credentials/builder.c @@ -17,7 +17,6 @@ ENUM(builder_part_names, BUILD_FROM_FILE, BUILD_END, "BUILD_FROM_FILE", - "BUILD_FROM_FD", "BUILD_AGENT_SOCKET", "BUILD_BLOB", "BUILD_BLOB_ASN1_DER", diff --git a/src/libstrongswan/credentials/builder.h b/src/libstrongswan/credentials/builder.h index 5ab462fa8..103b823c0 100644 --- a/src/libstrongswan/credentials/builder.h +++ b/src/libstrongswan/credentials/builder.h @@ -45,8 +45,6 @@ typedef void* (*builder_function_t)(int subtype, va_list args); enum builder_part_t { /** path to a file encoded in any format, char* */ BUILD_FROM_FILE, - /** file descriptor to read data, encoded in any format, int */ - BUILD_FROM_FD, /** unix socket of a ssh/pgp agent, char* */ BUILD_AGENT_SOCKET, /** An arbitrary blob of data, chunk_t */ diff --git a/src/libstrongswan/credentials/cred_encoding.h b/src/libstrongswan/credentials/cred_encoding.h index 41481f376..27a887f27 100644 --- a/src/libstrongswan/credentials/cred_encoding.h +++ b/src/libstrongswan/credentials/cred_encoding.h @@ -87,6 +87,8 @@ enum cred_encoding_type_t { PRIVKEY_PGP, /** DNSKEY encoding */ PUBKEY_DNSKEY, + /** SSHKEY encoding (Base64) */ + PUBKEY_SSHKEY, /** ASN.1 DER encoded certificate */ CERT_ASN1_DER, |