From 79c6f16212ad69a0c74cd3be5a63dce5e449e2fd Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Mon, 14 Sep 2009 20:04:48 +0200 Subject: Implemented support for preinstalled PGP certificates in charon --- src/libstrongswan/plugins/pem/pem_builder.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/libstrongswan/plugins/pem/pem_builder.c') diff --git a/src/libstrongswan/plugins/pem/pem_builder.c b/src/libstrongswan/plugins/pem/pem_builder.c index c53e1e9cd..eb3d300a6 100644 --- a/src/libstrongswan/plugins/pem/pem_builder.c +++ b/src/libstrongswan/plugins/pem/pem_builder.c @@ -375,6 +375,11 @@ static void *load_from_blob(chunk_t blob, credential_type_t type, int subtype, * RSA for PGP keys, which is actually wrong. */ subtype = KEY_ANY; } + /* if CERT_ANY is given, ASN1 encoded blob is handled as X509 */ + if (type == CRED_CERTIFICATE && subtype == CERT_ANY) + { + subtype = pgp ? CERT_GPG : CERT_X509; + } } cred = lib->creds->create(lib->creds, type, subtype, pgp ? BUILD_BLOB_PGP : BUILD_BLOB_ASN1_DER, blob, -- cgit v1.2.3