diff options
| author | Martin Willi <martin@strongswan.org> | 2009-09-14 20:04:48 +0200 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2009-09-15 08:23:48 +0200 |
| commit | 79c6f16212ad69a0c74cd3be5a63dce5e449e2fd (patch) | |
| tree | 5cf187e41e854e3cdc119e3f135da28009782b6c /src/charon/plugins/stroke | |
| parent | 4cb0e1bb76434ae448701c8d51aabbf47aaaeb0e (diff) | |
| download | strongswan-79c6f16212ad69a0c74cd3be5a63dce5e449e2fd.tar.bz2 strongswan-79c6f16212ad69a0c74cd3be5a63dce5e449e2fd.tar.xz | |
Implemented support for preinstalled PGP certificates in charon
Diffstat (limited to 'src/charon/plugins/stroke')
| -rw-r--r-- | src/charon/plugins/stroke/stroke_cred.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/charon/plugins/stroke/stroke_cred.c b/src/charon/plugins/stroke/stroke_cred.c index 9133a1380..5f322c5f9 100644 --- a/src/charon/plugins/stroke/stroke_cred.c +++ b/src/charon/plugins/stroke/stroke_cred.c @@ -240,8 +240,8 @@ static enumerator_t* create_cert_enumerator(private_stroke_cred_t *this, (cert == CERT_X509_CRL)? (void*)crl_filter : (void*)ac_filter, data, (void*)id_data_destroy); } - if (cert != CERT_X509 && cert != CERT_ANY) - { /* we only have X509 certificates. TODO: ACs? */ + if (cert != CERT_X509 && cert != CERT_GPG && cert != CERT_ANY) + { /* we have X509/PGP certificates. TODO: ACs? */ return NULL; } data = malloc_thing(id_data_t); @@ -484,9 +484,8 @@ static certificate_t* load_peer(private_stroke_cred_t *this, char *filename) } cert = lib->creds->create(lib->creds, - CRED_CERTIFICATE, CERT_X509, + CRED_CERTIFICATE, CERT_ANY, BUILD_FROM_FILE, path, - BUILD_X509_FLAG, 0, BUILD_END); if (cert) { |