From 1b2aa7959c86a835491c8cfca8c0683b747c1855 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Mon, 9 Oct 2006 16:29:05 +0000 Subject: Merge in vendor branch OpenSSL changes 0.9.8b -> 0.9.8d svn path=/openssl/vendor/current/CHANGES; revision=375 --- openssl/vendor/current/apps/dsa.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'openssl/vendor/current/apps/dsa.c') diff --git a/openssl/vendor/current/apps/dsa.c b/openssl/vendor/current/apps/dsa.c index a5ec5d7e..d503031e 100644 --- a/openssl/vendor/current/apps/dsa.c +++ b/openssl/vendor/current/apps/dsa.c @@ -84,6 +84,9 @@ * -aes128 - encrypt output if PEM format * -aes192 - encrypt output if PEM format * -aes256 - encrypt output if PEM format + * -camellia128 - encrypt output if PEM format + * -camellia192 - encrypt output if PEM format + * -camellia256 - encrypt output if PEM format * -text - print a text version * -modulus - print the DSA public key */ @@ -211,6 +214,10 @@ bad: #ifndef OPENSSL_NO_AES 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," -text print the key in text\n"); BIO_printf(bio_err," -noout don't print key out\n"); -- cgit v1.2.3