X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=apps%2Fgenrsa.c;h=d716a3cde353477254fb92d4832e954d327bb77b;hb=85c6749216f47bcefc916d4b0331794dac0a5db7;hp=4f62cfd04f3d1b654345e04a0fa0a3dc99123c58;hpb=3eeaab4bed46e3320947d0f609b82007b65b5a46;p=oweals%2Fopenssl.git

diff --git a/apps/genrsa.c b/apps/genrsa.c
index 4f62cfd04f..d716a3cde3 100644
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -167,6 +167,14 @@ int MAIN(int argc, char **argv)
 			enc=EVP_aes_192_cbc();
 		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)
 			{
@@ -190,6 +198,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," -out file       output the key to 'file\n");
 		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");