diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-03-05 13:28:21 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-03-05 13:28:21 +0000 |
| commit | bb845ee044587a91589357a772a02cffb0ba4454 (patch) | |
| tree | 998a8b98143b2fc67713860a4d2c8b1fee29b700 /apps/dgst.c | |
| parent | b5cfc2f590fd143611cc87f9fd6571dacda45e31 (diff) | |
Add -engine_impl option to dgst which will use an implementation of
an algorithm from the supplied engine instead of just the default one.
Diffstat (limited to 'apps/dgst.c')
| -rw-r--r-- | apps/dgst.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/apps/dgst.c b/apps/dgst.c index 9bf38ce73b..191bc25ee8 100644 --- a/apps/dgst.c +++ b/apps/dgst.c @@ -103,7 +103,7 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { - ENGINE *e = NULL; + ENGINE *e = NULL, *impl = NULL; unsigned char *buf=NULL; int i,err=1; const EVP_MD *md=NULL,*m; @@ -124,6 +124,7 @@ int MAIN(int argc, char **argv) char *passargin = NULL, *passin = NULL; #ifndef OPENSSL_NO_ENGINE char *engine=NULL; + int engine_impl = 0; #endif char *hmac_key=NULL; char *mac_name=NULL; @@ -208,6 +209,8 @@ int MAIN(int argc, char **argv) engine= *(++argv); e = setup_engine(bio_err, engine, 0); } + else if (strcmp(*argv,"-engine_impl") == 0) + engine_impl = 1; #endif else if (strcmp(*argv,"-hex") == 0) out_bin = 0; @@ -286,6 +289,11 @@ int MAIN(int argc, char **argv) goto end; } +#ifndef OPENSSL_NO_ENGINE + if (engine_impl) + impl = e; +#endif + in=BIO_new(BIO_s_file()); bmd=BIO_new(BIO_f_md()); if (debug) @@ -363,7 +371,7 @@ int MAIN(int argc, char **argv) { EVP_PKEY_CTX *mac_ctx = NULL; int r = 0; - if (!init_gen_str(bio_err, &mac_ctx, mac_name,e, 0)) + if (!init_gen_str(bio_err, &mac_ctx, mac_name, impl, 0)) goto mac_end; if (macopts) { @@ -397,7 +405,7 @@ int MAIN(int argc, char **argv) if (hmac_key) { - sigkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, e, + sigkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, impl, (unsigned char *)hmac_key, -1); if (!sigkey) goto end; @@ -415,9 +423,9 @@ int MAIN(int argc, char **argv) goto end; } if (do_verify) - r = EVP_DigestVerifyInit(mctx, &pctx, md, e, sigkey); + r = EVP_DigestVerifyInit(mctx, &pctx, md, impl, sigkey); else - r = EVP_DigestSignInit(mctx, &pctx, md, e, sigkey); + r = EVP_DigestSignInit(mctx, &pctx, md, impl, sigkey); if (!r) { BIO_printf(bio_err, "Error setting context\n"); @@ -444,9 +452,16 @@ int MAIN(int argc, char **argv) /* we use md as a filter, reading from 'in' */ else { + EVP_MD_CTX *mctx = NULL; + if (!BIO_get_md_ctx(bmd, &mctx)) + { + BIO_printf(bio_err, "Error getting context\n"); + ERR_print_errors(bio_err); + goto end; + } if (md == NULL) md = EVP_md5(); - if (!BIO_set_md(bmd,md)) + if (!EVP_DigestInit_ex(mctx, md, impl)) { BIO_printf(bio_err, "Error setting digest %s\n", pname); ERR_print_errors(bio_err); |