diff options
| author | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-05-19 13:41:58 +0200 |
|---|---|---|
| committer | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-05-19 13:41:58 +0200 |
| commit | b590992f735393c97489fce191e7810eaae4f6d7 (patch) | |
| tree | 286595c4aa43dbf3d616d816e5fade6ac364771a /src/libstrongswan/credentials/sets/mem_cred.h | |
| parent | 2fce29055b7b5bc2860d503d1ae822931f80b7aa (diff) | |
| parent | 0a9d51a49042a68daa15b0c74a2b7f152f52606b (diff) | |
| download | vyos-strongswan-b590992f735393c97489fce191e7810eaae4f6d7.tar.gz vyos-strongswan-b590992f735393c97489fce191e7810eaae4f6d7.zip | |
Merge upstream version 4.5.2
Diffstat (limited to 'src/libstrongswan/credentials/sets/mem_cred.h')
| -rw-r--r-- | src/libstrongswan/credentials/sets/mem_cred.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/libstrongswan/credentials/sets/mem_cred.h b/src/libstrongswan/credentials/sets/mem_cred.h index 274e07566..eb46b065b 100644 --- a/src/libstrongswan/credentials/sets/mem_cred.h +++ b/src/libstrongswan/credentials/sets/mem_cred.h @@ -1,9 +1,6 @@ /* -<<<<<<< HEAD -======= * Copyright (C) 2010 Tobias Brunner * Hochschule fuer Technik Rapperswil ->>>>>>> upstream/4.5.1 * Copyright (C) 2010 Martin Willi * Copyright (C) 2010 revosec AG * @@ -29,11 +26,8 @@ typedef struct mem_cred_t mem_cred_t; #include <credentials/credential_set.h> -<<<<<<< HEAD -======= #include <credentials/certificates/crl.h> #include <utils/linked_list.h> ->>>>>>> upstream/4.5.1 /** * Generic in-memory credential set. @@ -54,8 +48,6 @@ struct mem_cred_t { void (*add_cert)(mem_cred_t *this, bool trusted, certificate_t *cert); /** -<<<<<<< HEAD -======= * Add a certificate to the credential set, returning a reference to it or * to a cached duplicate. * @@ -76,7 +68,6 @@ struct mem_cred_t { bool (*add_crl)(mem_cred_t *this, crl_t *crl); /** ->>>>>>> upstream/4.5.1 * Add a private key to the credential set. * * @param key key, reference gets owned by set @@ -87,17 +78,11 @@ struct mem_cred_t { * Add a shared key to the credential set. * * @param shared shared key to add, gets owned by set -<<<<<<< HEAD - * @param ... NULL terminated list of owners identification_t* -======= * @param ... NULL terminated list of owners (identification_t*) ->>>>>>> upstream/4.5.1 */ void (*add_shared)(mem_cred_t *this, shared_key_t *shared, ...); /** -<<<<<<< HEAD -======= * Add a shared key to the credential set. * * @param shared shared key to add, gets owned by set @@ -116,21 +101,17 @@ struct mem_cred_t { identification_t *id, char *uri); /** ->>>>>>> upstream/4.5.1 * Clear all credentials from the credential set. */ void (*clear)(mem_cred_t *this); /** -<<<<<<< HEAD -======= * Clear the secrets (private and shared keys, not the certificates) from * the credential set. */ void (*clear_secrets)(mem_cred_t *this); /** ->>>>>>> upstream/4.5.1 * Destroy a mem_cred_t. */ void (*destroy)(mem_cred_t *this); |