diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-05-17 18:46:22 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-05-17 18:46:22 +0000 |
| commit | 121dd39f9f37e5812d99f0c3cb791803dff0a7a7 (patch) | |
| tree | 07b939163546ca1f05fe6ba594813c8e389c95a2 /apps | |
| parent | a263253545a6b576af7cc62e17873c34aa55e1a0 (diff) | |
| download | openssl-new-121dd39f9f37e5812d99f0c3cb791803dff0a7a7.tar.gz | |
New option to pkcs12 utility to set alternative MAC digest algorithm.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/pkcs12.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 037aa3f011..ec9cc89114 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -121,6 +121,7 @@ int MAIN(int argc, char **argv) char *passargin = NULL, *passargout = NULL, *passarg = NULL; char *passin = NULL, *passout = NULL; char *inrand = NULL; + char *macalg = NULL; char *CApath = NULL, *CAfile = NULL; #ifndef OPENSSL_NO_ENGINE char *engine=NULL; @@ -170,6 +171,11 @@ int MAIN(int argc, char **argv) maciter = 1; else if (!strcmp (*args, "-nomac")) maciter = -1; + else if (!strcmp (*args, "-macalg")) + if (args[1]) { + args++; + macalg = *args; + } else badarg = 1; else if (!strcmp (*args, "-nodes")) enc=NULL; else if (!strcmp (*args, "-certpbe")) { if (!set_pbe(bio_err, &cert_pbe, *++args)) @@ -393,6 +399,7 @@ int MAIN(int argc, char **argv) EVP_PKEY *key = NULL; X509 *ucert = NULL, *x = NULL; STACK_OF(X509) *certs=NULL; + const EVP_MD *macmd = NULL; unsigned char *catmp = NULL; int i; @@ -554,8 +561,18 @@ int MAIN(int argc, char **argv) goto export_end; } + if (macalg) + { + macmd = EVP_get_digestbyname(macalg); + if (!macmd) + { + BIO_printf(bio_err, "Unknown digest algorithm %s\n", + macalg); + } + } + if (maciter != -1) - PKCS12_set_mac(p12, mpass, -1, NULL, 0, maciter, NULL); + PKCS12_set_mac(p12, mpass, -1, NULL, 0, maciter, macmd); #ifdef CRYPTO_MDEBUG CRYPTO_pop_info(); |