diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-02-20 18:03:07 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-02-20 18:03:07 +0000 |
| commit | b3dfaaa143d06eb23ec0985ba37bd9ab24bee6bb (patch) | |
| tree | 446c34f771f45a446b06d726a93363d193216794 /apps/pkcs12.c | |
| parent | 5b7848a34578e5819e9bb335e9da0e9d04ab921d (diff) | |
Add AES support in the applications that support -des and -des3.
Diffstat (limited to 'apps/pkcs12.c')
| -rw-r--r-- | apps/pkcs12.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 0e2bd6dbcd..a424218034 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -151,6 +151,11 @@ int MAIN(int argc, char **argv) else if (!strcmp (*args, "-idea")) enc=EVP_idea_cbc(); #endif else if (!strcmp (*args, "-des3")) enc = EVP_des_ede3_cbc(); +#ifndef OPENSSL_NO_AES + else if (!strcmp(*argv,"-aes128")) enc=EVP_aes_128_cbc(); + else if (!strcmp(*argv,"-aes192")) enc=EVP_aes_192_cbc(); + else if (!strcmp(*argv,"-aes256")) enc=EVP_aes_256_cbc(); +#endif else if (!strcmp (*args, "-noiter")) iter = 1; else if (!strcmp (*args, "-maciter")) maciter = PKCS12_DEFAULT_ITER; @@ -280,6 +285,10 @@ int MAIN(int argc, char **argv) #ifndef OPENSSL_NO_IDEA BIO_printf (bio_err, "-idea encrypt private keys with idea\n"); #endif +#ifndef OPENSSL_NO_AES + BIO_printf (bio_err, "-aes128, -aes192, -aes256\n"); + BIO_printf (bio_err, " encrypt PEM output with cbc aes\n"); +#endif BIO_printf (bio_err, "-nodes don't encrypt private keys\n"); BIO_printf (bio_err, "-noiter don't use encryption iteration\n"); BIO_printf (bio_err, "-maciter use MAC iteration\n"); |