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/gendsa.c | |
| parent | fb7b3932786e4277eb3235adc239686806cd9610 (diff) | |
Camellia cipher, contributed by NTT
Submitted by: Masashi Fujita
Reviewed by: Bodo Moeller
Diffstat (limited to 'apps/gendsa.c')
| -rw-r--r-- | apps/gendsa.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/apps/gendsa.c b/apps/gendsa.c index 828e27f1c0..936a42b810 100644 --- a/apps/gendsa.c +++ b/apps/gendsa.c @@ -148,6 +148,14 @@ int MAIN(int argc, char **argv) else if (strcmp(*argv,"-aes256") == 0) enc=EVP_aes_256_cbc(); #endif +#ifndef OPENSSL_NO_CAMELLIA + else if (strcmp(*argv,"-camellia128") == 0) + enc=EVP_camellia_128_cbc(); + else if (strcmp(*argv,"-camellia192") == 0) + enc=EVP_camellia_192_cbc(); + else if (strcmp(*argv,"-camellia256") == 0) + enc=EVP_camellia_256_cbc(); +#endif else if (**argv != '-' && dsaparams == NULL) { dsaparams = *argv; @@ -174,6 +182,10 @@ bad: 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 #ifndef OPENSSL_NO_ENGINE BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n"); #endif |