Use a dedicated build part for challenge passwords, BUILD_PASSPHRASE gets obsolete
This commit is contained in:
parent
0556667dca
commit
3429be9514
|
@ -45,6 +45,7 @@ ENUM(builder_part_names, BUILD_FROM_FILE, BUILD_END,
|
||||||
"BUILD_PATHLEN",
|
"BUILD_PATHLEN",
|
||||||
"BUILD_X509_FLAG",
|
"BUILD_X509_FLAG",
|
||||||
"BUILD_REVOKED_ENUMERATOR",
|
"BUILD_REVOKED_ENUMERATOR",
|
||||||
|
"BUILD_CHALLENGE_PWD",
|
||||||
"BUILD_PKCS11_MODULE",
|
"BUILD_PKCS11_MODULE",
|
||||||
"BUILD_PKCS11_SLOT",
|
"BUILD_PKCS11_SLOT",
|
||||||
"BUILD_PKCS11_KEYID",
|
"BUILD_PKCS11_KEYID",
|
||||||
|
|
|
@ -103,6 +103,8 @@ enum builder_part_t {
|
||||||
BUILD_X509_FLAG,
|
BUILD_X509_FLAG,
|
||||||
/** enumerator_t over (chunk_t serial, time_t date, crl_reason_t reason) */
|
/** enumerator_t over (chunk_t serial, time_t date, crl_reason_t reason) */
|
||||||
BUILD_REVOKED_ENUMERATOR,
|
BUILD_REVOKED_ENUMERATOR,
|
||||||
|
/** PKCS#10 challenge password */
|
||||||
|
BUILD_CHALLENGE_PWD,
|
||||||
/** friendly name of a PKCS#11 module, null terminated char* */
|
/** friendly name of a PKCS#11 module, null terminated char* */
|
||||||
BUILD_PKCS11_MODULE,
|
BUILD_PKCS11_MODULE,
|
||||||
/** slot specifier for a token in a PKCS#11 module, int */
|
/** slot specifier for a token in a PKCS#11 module, int */
|
||||||
|
|
|
@ -684,7 +684,7 @@ x509_pkcs10_t *x509_pkcs10_gen(certificate_type_t type, va_list args)
|
||||||
enumerator->destroy(enumerator);
|
enumerator->destroy(enumerator);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case BUILD_PASSPHRASE:
|
case BUILD_CHALLENGE_PWD:
|
||||||
cert->challengePassword = chunk_clone(va_arg(args, chunk_t));
|
cert->challengePassword = chunk_clone(va_arg(args, chunk_t));
|
||||||
continue;
|
continue;
|
||||||
case BUILD_DIGEST_ALG:
|
case BUILD_DIGEST_ALG:
|
||||||
|
|
|
@ -127,7 +127,7 @@ static int req()
|
||||||
BUILD_SIGNING_KEY, private,
|
BUILD_SIGNING_KEY, private,
|
||||||
BUILD_SUBJECT, id,
|
BUILD_SUBJECT, id,
|
||||||
BUILD_SUBJECT_ALTNAMES, san,
|
BUILD_SUBJECT_ALTNAMES, san,
|
||||||
BUILD_PASSPHRASE, challenge_password,
|
BUILD_CHALLENGE_PWD, challenge_password,
|
||||||
BUILD_DIGEST_ALG, digest,
|
BUILD_DIGEST_ALG, digest,
|
||||||
BUILD_END);
|
BUILD_END);
|
||||||
if (!cert)
|
if (!cert)
|
||||||
|
|
|
@ -859,7 +859,7 @@ int main(int argc, char **argv)
|
||||||
BUILD_SIGNING_KEY, private_key,
|
BUILD_SIGNING_KEY, private_key,
|
||||||
BUILD_SUBJECT, subject,
|
BUILD_SUBJECT, subject,
|
||||||
BUILD_SUBJECT_ALTNAMES, subjectAltNames,
|
BUILD_SUBJECT_ALTNAMES, subjectAltNames,
|
||||||
BUILD_PASSPHRASE, challengePassword,
|
BUILD_CHALLENGE_PWD, challengePassword,
|
||||||
BUILD_DIGEST_ALG, pkcs10_signature_alg,
|
BUILD_DIGEST_ALG, pkcs10_signature_alg,
|
||||||
BUILD_END);
|
BUILD_END);
|
||||||
if (!pkcs10_req)
|
if (!pkcs10_req)
|
||||||
|
|
Loading…
Reference in New Issue