diff options
| author | Rob Austein <sra@hactrn.net> | 2006-10-09 16:47:10 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2006-10-09 16:47:10 +0000 |
| commit | 4043d7db4e466d15193c3bad3b204048fc13b785 (patch) | |
| tree | 8156ce31a6e4a155fc240551f48c23b5a42a6e5e /openssl/trunk/apps/gendsa.c | |
| parent | aba277548b76071e75fc9478002a6fc2145f64f1 (diff) | |
Merged in changes from OpenSSL 0.9.8d
svn path=/openssl/trunk/CHANGES; revision=377
Diffstat (limited to 'openssl/trunk/apps/gendsa.c')
| -rw-r--r-- | openssl/trunk/apps/gendsa.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/openssl/trunk/apps/gendsa.c b/openssl/trunk/apps/gendsa.c index 828e27f1..936a42b8 100644 --- a/openssl/trunk/apps/gendsa.c +++ b/openssl/trunk/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 |