diff options
| author | Bodo Möller <bodo@openssl.org> | 2006-06-09 15:44:59 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2006-06-09 15:44:59 +0000 |
| commit | f3dea9a5958b576345bae710c0acd2e52ecde0c8 (patch) | |
| tree | 795c13bb1a22819cac949744a3dd5cc428270187 /apps/smime.c | |
| parent | fb7b3932786e4277eb3235adc239686806cd9610 (diff) | |
Camellia cipher, contributed by NTT
Submitted by: Masashi Fujita
Reviewed by: Bodo Moeller
Diffstat (limited to 'apps/smime.c')
| -rw-r--r-- | apps/smime.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/apps/smime.c b/apps/smime.c index c5453eafe2..69ce28039a 100644 --- a/apps/smime.c +++ b/apps/smime.c @@ -168,6 +168,14 @@ int MAIN(int argc, char **argv) else if (!strcmp(*args,"-aes256")) cipher = EVP_aes_256_cbc(); #endif +#ifndef OPENSSL_NO_CAMELLIA + else if (!strcmp(*args,"-camellia128")) + cipher = EVP_camellia_128_cbc(); + else if (!strcmp(*args,"-camellia192")) + cipher = EVP_camellia_192_cbc(); + else if (!strcmp(*args,"-camellia256")) + cipher = EVP_camellia_256_cbc(); +#endif else if (!strcmp (*args, "-text")) flags |= PKCS7_TEXT; else if (!strcmp (*args, "-nointern")) @@ -430,6 +438,10 @@ int MAIN(int argc, char **argv) BIO_printf (bio_err, "-aes128, -aes192, -aes256\n"); BIO_printf (bio_err, " encrypt PEM output with cbc aes\n"); #endif +#ifndef OPENSSL_NO_CAMELLIA + BIO_printf (bio_err, "-camellia128, -camellia192, -camellia256\n"); + BIO_printf (bio_err, " encrypt PEM output with cbc camellia\n"); +#endif BIO_printf (bio_err, "-nointern don't search certificates in message for signer\n"); BIO_printf (bio_err, "-nosigs don't verify message signature\n"); BIO_printf (bio_err, "-noverify don't verify signers certificate\n"); |