diff options
author | simon <simon@FreeBSD.org> | 2006-10-01 07:38:44 +0000 |
---|---|---|
committer | simon <simon@FreeBSD.org> | 2006-10-01 07:38:44 +0000 |
commit | 387e65d767783525d46f90e7415169ff0015f809 (patch) | |
tree | ddbe8498869205da709070fe1d40135d495b9326 /crypto/openssl/apps/genrsa.c | |
parent | fb3c70eda88d3175627edc6a3316b4508b3d29c5 (diff) | |
download | FreeBSD-src-387e65d767783525d46f90e7415169ff0015f809.zip FreeBSD-src-387e65d767783525d46f90e7415169ff0015f809.tar.gz |
Vendor import of OpenSSL 0.9.8d.
Diffstat (limited to 'crypto/openssl/apps/genrsa.c')
-rw-r--r-- | crypto/openssl/apps/genrsa.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/crypto/openssl/apps/genrsa.c b/crypto/openssl/apps/genrsa.c index 4f62cfd..d716a3c 100644 --- a/crypto/openssl/apps/genrsa.c +++ b/crypto/openssl/apps/genrsa.c @@ -168,6 +168,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 (strcmp(*argv,"-passout") == 0) { if (--argc < 1) goto bad; @@ -191,6 +199,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 BIO_printf(bio_err," -out file output the key to 'file\n"); BIO_printf(bio_err," -passout arg output file pass phrase source\n"); BIO_printf(bio_err," -f4 use F4 (0x10001) for the E value\n"); |