diff options
| author | Martin Willi <martin@revosec.ch> | 2010-07-19 16:25:26 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2010-08-04 09:26:21 +0200 |
| commit | 0d08ebe7acb8ea892e6c57e78bd648c0a04df92f (patch) | |
| tree | e02ac3a320c9124a015b68f4a433df251c9eae31 /src/libstrongswan/credentials/sets | |
| parent | af007ed68ac066076f860608127488ab8ee30313 (diff) | |
| download | strongswan-0d08ebe7acb8ea892e6c57e78bd648c0a04df92f.tar.bz2 strongswan-0d08ebe7acb8ea892e6c57e78bd648c0a04df92f.tar.xz | |
Pass type of requested key in the callback credential set
Diffstat (limited to 'src/libstrongswan/credentials/sets')
| -rw-r--r-- | src/libstrongswan/credentials/sets/callback_cred.c | 5 | ||||
| -rw-r--r-- | src/libstrongswan/credentials/sets/callback_cred.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/libstrongswan/credentials/sets/callback_cred.c b/src/libstrongswan/credentials/sets/callback_cred.c index 87a0789d3..bff33f029 100644 --- a/src/libstrongswan/credentials/sets/callback_cred.c +++ b/src/libstrongswan/credentials/sets/callback_cred.c @@ -49,6 +49,8 @@ typedef struct { enumerator_t public; /* backref to this */ private_callback_cred_t *this; + /* type if requested key */ + shared_key_type_t type; /* own identity to match */ identification_t *me; /* other identity to match */ @@ -62,7 +64,7 @@ METHOD(enumerator_t, shared_enumerate, bool, id_match_t *match_me, id_match_t *match_other) { DESTROY_IF(this->current); - this->current = this->this->cb.shared(this->this->data, + this->current = this->this->cb.shared(this->this->data, this->type, this->me, this->other, match_me, match_other); if (this->current) { @@ -91,6 +93,7 @@ METHOD(credential_set_t, create_shared_enumerator, enumerator_t*, .destroy = _shared_destroy, }, .this = this, + .type = type, .me = me, .other = other, ); diff --git a/src/libstrongswan/credentials/sets/callback_cred.h b/src/libstrongswan/credentials/sets/callback_cred.h index 9cc5b65ea..efc4c7fa5 100644 --- a/src/libstrongswan/credentials/sets/callback_cred.h +++ b/src/libstrongswan/credentials/sets/callback_cred.h @@ -28,12 +28,14 @@ typedef struct callback_cred_t callback_cred_t; /** * Callback function to get shared keys. * + * @param type type of requested shared key * @param me own identity * @param other other identity * @param match_me match result of own identity * @param match_other match result of other identity */ -typedef shared_key_t* (*callback_cred_shared_cb_t)(void *data, +typedef shared_key_t* (*callback_cred_shared_cb_t)( + void *data, shared_key_type_t type, identification_t *me, identification_t *other, id_match_t *match_me, id_match_t *match_other); |