3 files changed, 10 insertions, 2 deletions
diff --git a/src/libstrongswan/credentials/builder.c b/src/libstrongswan/credentials/builder.c
index c4c3ba176..a2985efba 100644
--- a/src/libstrongswan/credentials/builder.c
+++ b/src/libstrongswan/credentials/builder.c
@@ -27,5 +27,6 @@ ENUM(builder_part_names, BUILD_BLOB_ASN1_DER, BUILD_END,
 	"BUILD_ISSUER_ALTNAME",
 	"BUILD_CA_CERT",
 	"BUILD_CERT",
+	"BUILD_X509_FLAG",
 	"BUILD_END",
 );
diff --git a/src/libstrongswan/credentials/builder.h b/src/libstrongswan/credentials/builder.h
index 14c3d2496..fd1cc69cf 100644
--- a/src/libstrongswan/credentials/builder.h
+++ b/src/libstrongswan/credentials/builder.h
@@ -58,8 +58,10 @@ enum builder_part_t {
 	BUILD_ISSUER_ALTNAME,
 	/** a CA certificate, certificate_t* */
 	BUILD_CA_CERT,
-	/** a certificcate, certificate_t* */
+	/** a certificate, certificate_t* */
 	BUILD_CERT,
+	/** enforce an additional X509 flag, x509_flag_t */
+	BUILD_X509_FLAG,
 	/** end of variable argument builder list */
 	BUILD_END,
 };
diff --git a/src/libstrongswan/credentials/credential_factory.c b/src/libstrongswan/credentials/credential_factory.c
index ab99a4211..635829386 100644
--- a/src/libstrongswan/credentials/credential_factory.c
+++ b/src/libstrongswan/credentials/credential_factory.c
@@ -20,6 +20,7 @@
 #include <debug.h>
 #include <utils/linked_list.h>
 #include <utils/mutex.h>
+#include <credentials/certificates/x509.h>
 
 typedef struct private_credential_factory_t private_credential_factory_t;
 
@@ -147,6 +148,9 @@ static void* create(private_credential_factory_t *this, credential_type_t type,
 				case BUILD_BLOB_ASN1_DER:
 					builder->add(builder, part, va_arg(args, chunk_t));
 					continue;
+				case BUILD_X509_FLAG:
+					builder->add(builder, part, va_arg(args, x509_flag_t));
+					continue;
 				case BUILD_KEY_SIZE:
 					builder->add(builder, part, va_arg(args, u_int));
 					continue;
@@ -164,7 +168,7 @@ static void* create(private_credential_factory_t *this, credential_type_t type,
 				default:
 					DBG1("builder part %N not supported by factory",
 						 builder_part_names, part);
-					continue;
+					break;
 			}
 			break;
 		}
@@ -219,6 +223,7 @@ static void* create(private_credential_factory_t *this, credential_type_t type,
 				continue;
 			}
 			case BUILD_KEY_SIZE:
+			case BUILD_X509_FLAG:
 				continue;
 			default:
 				DBG1("builder part %N not supported by factory",