Add builder parts to generate PKCS#7 containers

diff --git a/src/libstrongswan/credentials/builder.c b/src/libstrongswan/credentials/builder.c
index b86ca5e2f6999cae6c5453ca4050230ae7779a9b..f5858382f2c963cb663ae73dc32975f878881dee 100644 (file)
--- a/src/libstrongswan/credentials/builder.c
+++ b/src/libstrongswan/credentials/builder.c
@@ -19,6 +19,7 @@ ENUM(builder_part_names, BUILD_FROM_FILE, BUILD_END,
        "BUILD_FROM_FILE",
        "BUILD_FROM_FD",
        "BUILD_AGENT_SOCKET",
+       "BUILD_BLOB",
        "BUILD_BLOB_ASN1_DER",
        "BUILD_BLOB_PEM",
        "BUILD_BLOB_PGP",
@@ -36,6 +37,7 @@ ENUM(builder_part_names, BUILD_FROM_FILE, BUILD_END,
        "BUILD_NOT_AFTER_TIME",
        "BUILD_SERIAL",
        "BUILD_DIGEST_ALG",
+       "BUILD_ENCRYPTION_ALG",
        "BUILD_IETF_GROUP_ATTR",
        "BUILD_CA_CERT",
        "BUILD_CERT",
@@ -53,6 +55,7 @@ ENUM(builder_part_names, BUILD_FROM_FILE, BUILD_END,
        "BUILD_REVOKED_ENUMERATOR",
        "BUILD_BASE_CRL",
        "BUILD_CHALLENGE_PWD",
+       "BUILD_PKCS7_ATTRIBUTE",
        "BUILD_PKCS11_MODULE",
        "BUILD_PKCS11_SLOT",
        "BUILD_PKCS11_KEYID",

diff --git a/src/libstrongswan/credentials/builder.h b/src/libstrongswan/credentials/builder.h
index 23bd1d5dc4a45ee98b6c7153cf294ac82adb597b..740041aac9a61e3800cf7c90aea9b5c05e75772a 100644 (file)
--- a/src/libstrongswan/credentials/builder.h
+++ b/src/libstrongswan/credentials/builder.h
@@ -49,6 +49,8 @@ enum builder_part_t {
        BUILD_FROM_FD,
        /** unix socket of a ssh/pgp agent, char* */
        BUILD_AGENT_SOCKET,
+       /** An arbitrary blob of data, chunk_t */
+       BUILD_BLOB,
        /** DER encoded ASN.1 blob, chunk_t */
        BUILD_BLOB_ASN1_DER,
        /** PEM encoded ASN.1/PGP blob, chunk_t */
@@ -81,8 +83,10 @@ enum builder_part_t {
        BUILD_NOT_AFTER_TIME,
        /** a serial number in binary form, chunk_t */
        BUILD_SERIAL,
-       /** digest algorithm to be used for signature, int */
+       /** digest algorithm to be used for signature, hash_algorithm_t */
        BUILD_DIGEST_ALG,
+       /** encryption algorithm to use, encryption_algorithm_t */
+       BUILD_ENCRYPTION_ALG,
        /** a comma-separated list of ietf group attributes, char* */
        BUILD_IETF_GROUP_ATTR,
        /** a ca certificate, certificate_t* */
@@ -117,6 +121,8 @@ enum builder_part_t {
        BUILD_BASE_CRL,
        /** PKCS#10 challenge password */
        BUILD_CHALLENGE_PWD,
+       /** PKCS#7 attribute, int oid, chunk_t with ASN1 type encoded value */
+       BUILD_PKCS7_ATTRIBUTE,
        /** friendly name of a PKCS#11 module, null terminated char* */
        BUILD_PKCS11_MODULE,
        /** slot specifier for a token in a PKCS#11 module, int */