From: Martin Willi <martin@strongswan.org>
Date: Wed, 16 Sep 2009 09:24:35 +0000 (+0200)
Subject: Fixed loading of DER encoded certificate files
X-Git-Tag: 4.3.5rc1~153
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e1cade52fa34dd8207a566550252053dfd0f368;p=thirdparty%2Fstrongswan.git

Fixed loading of DER encoded certificate files
---

diff --git a/src/libstrongswan/plugins/pem/pem_builder.c b/src/libstrongswan/plugins/pem/pem_builder.c
index eb3d300a6e..2f285e9bc4 100644
--- a/src/libstrongswan/plugins/pem/pem_builder.c
+++ b/src/libstrongswan/plugins/pem/pem_builder.c
@@ -375,11 +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;
-		}
+	}
+	/* 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,