added Camellia encryption support to scepclient
This commit is contained in:
@@ -246,8 +246,9 @@ usage(const char *message)
|
|||||||
" --password (-p) <pw> challenge password\n"
|
" --password (-p) <pw> challenge password\n"
|
||||||
" - if pw is '%%prompt', password gets prompted for\n"
|
" - if pw is '%%prompt', password gets prompted for\n"
|
||||||
" --algorithm (-a) <algo> use specified algorithm for PKCS#7 encryption\n"
|
" --algorithm (-a) <algo> use specified algorithm for PKCS#7 encryption\n"
|
||||||
" <algo> = des-cbc | 3des-cbc | aes128-cbc |\n"
|
" <algo> = des-cbc | 3des-cbc (default) | \n"
|
||||||
" aes192-cbc | aes256-cbc (default: 3des-cbc)\n"
|
" aes128-cbc | aes192-cbc | aes256-cbc | \n"
|
||||||
|
" camellia128-cbc | camellia192-cbc | camellia256-cbc\n"
|
||||||
"\n"
|
"\n"
|
||||||
"Options for enrollment (cert):\n"
|
"Options for enrollment (cert):\n"
|
||||||
" --url (-u) <url> url of the SCEP server\n"
|
" --url (-u) <url> url of the SCEP server\n"
|
||||||
@@ -717,6 +718,18 @@ int main(int argc, char **argv)
|
|||||||
{
|
{
|
||||||
pkcs7_symmetric_cipher = OID_AES256_CBC;
|
pkcs7_symmetric_cipher = OID_AES256_CBC;
|
||||||
}
|
}
|
||||||
|
else if (strcaseeq("camellia128-cbc", optarg))
|
||||||
|
{
|
||||||
|
pkcs7_symmetric_cipher = OID_CAMELLIA128_CBC;
|
||||||
|
}
|
||||||
|
else if (strcaseeq("camellia192-cbc", optarg))
|
||||||
|
{
|
||||||
|
pkcs7_symmetric_cipher = OID_CAMELLIA192_CBC;
|
||||||
|
}
|
||||||
|
else if (strcaseeq("camellia256-cbc", optarg))
|
||||||
|
{
|
||||||
|
pkcs7_symmetric_cipher = OID_CAMELLIA256_CBC;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
usage("invalid encryption algorithm specified");
|
usage("invalid encryption algorithm specified");
|
||||||
|
|||||||
Reference in New Issue
Block a user