added ietf group attribute support to attibute certificate factory
This commit is contained in:
@@ -28,6 +28,7 @@ ENUM(builder_part_names, BUILD_BLOB_ASN1_DER, BUILD_END,
|
|||||||
"BUILD_NOT_BEFORE_TIME",
|
"BUILD_NOT_BEFORE_TIME",
|
||||||
"BUILD_NOT_AFTER_TIME",
|
"BUILD_NOT_AFTER_TIME",
|
||||||
"BUILD_SERIAL",
|
"BUILD_SERIAL",
|
||||||
|
"BUILD_IETF_GROUP_ATTR",
|
||||||
"BUILD_CA_CERT",
|
"BUILD_CA_CERT",
|
||||||
"BUILD_CERT",
|
"BUILD_CERT",
|
||||||
"BUILD_X509_FLAG",
|
"BUILD_X509_FLAG",
|
||||||
|
|||||||
@@ -60,9 +60,11 @@ enum builder_part_t {
|
|||||||
BUILD_NOT_BEFORE_TIME,
|
BUILD_NOT_BEFORE_TIME,
|
||||||
/** notAfter, time_t* */
|
/** notAfter, time_t* */
|
||||||
BUILD_NOT_AFTER_TIME,
|
BUILD_NOT_AFTER_TIME,
|
||||||
/** notAfter, time_t* */
|
|
||||||
BUILD_SERIAL,
|
|
||||||
/** a serial number in binary form, chunk_t */
|
/** a serial number in binary form, chunk_t */
|
||||||
|
BUILD_SERIAL,
|
||||||
|
/** a comma-separated list of ietf group attributes, char* */
|
||||||
|
BUILD_IETF_GROUP_ATTR,
|
||||||
|
/** a ca certificate, certificate_t* */
|
||||||
BUILD_CA_CERT,
|
BUILD_CA_CERT,
|
||||||
/** a certificate, certificate_t* */
|
/** a certificate, certificate_t* */
|
||||||
BUILD_CERT,
|
BUILD_CERT,
|
||||||
|
|||||||
@@ -168,6 +168,7 @@ static void* create(private_credential_factory_t *this, credential_type_t type,
|
|||||||
case BUILD_SIGNING_CERT:
|
case BUILD_SIGNING_CERT:
|
||||||
case BUILD_CA_CERT:
|
case BUILD_CA_CERT:
|
||||||
case BUILD_CERT:
|
case BUILD_CERT:
|
||||||
|
case BUILD_IETF_GROUP_ATTR:
|
||||||
builder->add(builder, part, va_arg(args, void*));
|
builder->add(builder, part, va_arg(args, void*));
|
||||||
continue;
|
continue;
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -757,6 +757,10 @@ static void add(private_builder_t *this, builder_part_t part, ...)
|
|||||||
case BUILD_SERIAL:
|
case BUILD_SERIAL:
|
||||||
this->ac->serialNumber = va_arg(args, chunk_t);
|
this->ac->serialNumber = va_arg(args, chunk_t);
|
||||||
break;
|
break;
|
||||||
|
case BUILD_IETF_GROUP_ATTR:
|
||||||
|
ietfAttr_list_create_from_string(va_arg(args, char*),
|
||||||
|
this->ac->groups);
|
||||||
|
break;
|
||||||
case BUILD_CERT:
|
case BUILD_CERT:
|
||||||
cert = va_arg(args, certificate_t*);
|
cert = va_arg(args, certificate_t*);
|
||||||
if (cert->get_type(cert) == CERT_X509)
|
if (cert->get_type(cert) == CERT_X509)
|
||||||
|
|||||||
@@ -572,6 +572,7 @@ int main(int argc, char **argv)
|
|||||||
BUILD_NOT_BEFORE_TIME, notBefore,
|
BUILD_NOT_BEFORE_TIME, notBefore,
|
||||||
BUILD_NOT_AFTER_TIME, notAfter,
|
BUILD_NOT_AFTER_TIME, notAfter,
|
||||||
BUILD_SERIAL, serial,
|
BUILD_SERIAL, serial,
|
||||||
|
BUILD_IETF_GROUP_ATTR, groups,
|
||||||
BUILD_SIGNING_CERT, signer_cert,
|
BUILD_SIGNING_CERT, signer_cert,
|
||||||
BUILD_SIGNING_KEY, signer_key,
|
BUILD_SIGNING_KEY, signer_key,
|
||||||
BUILD_END);
|
BUILD_END);
|
||||||
|
|||||||
Reference in New Issue
Block a user