app: add library context and propq arguments to opt_md() and opt_cipher()

[openssl.git] / apps / lib / opt.c

diff --git a/apps/lib/opt.c b/apps/lib/opt.c
index adb0417bd8ca163809fb9bc7c61af9c8986da76d..157367982d2fa9f71a596d927aceda38e5fe35e0 100644 (file)
--- a/apps/lib/opt.c
+++ b/apps/lib/opt.c
@@ -378,8 +378,10 @@ int opt_cipher_silent(const char *name, EVP_CIPHER **cipherp)
     EVP_CIPHER *c;
 
     ERR_set_mark();
     EVP_CIPHER *c;
 
     ERR_set_mark();

-    if ((c = EVP_CIPHER_fetch(NULL, name, NULL)) != NULL
-        || (c = (EVP_CIPHER *)EVP_get_cipherbyname(name)) != NULL) {
+    if ((c = EVP_CIPHER_fetch(app_get0_libctx(), name,
+                              app_get0_propq())) != NULL
+        || (opt_legacy_okay()
+            && (c = (EVP_CIPHER *)EVP_get_cipherbyname(name)) != NULL)) {

         ERR_pop_to_mark();
         if (cipherp != NULL) {
             EVP_CIPHER_free(*cipherp);
         ERR_pop_to_mark();
         if (cipherp != NULL) {
             EVP_CIPHER_free(*cipherp);


@@ -429,12 +431,19 @@ int opt_cipher(const char *name, EVP_CIPHER **cipherp)
  */
 int opt_md_silent(const char *name, EVP_MD **mdp)
 {
  */
 int opt_md_silent(const char *name, EVP_MD **mdp)
 {

-    EVP_MD_free(*mdp);
+    EVP_MD *md;

 
     ERR_set_mark();
 
     ERR_set_mark();

-    if ((*mdp = EVP_MD_fetch(NULL, name, NULL)) != NULL
-        || (*mdp = (EVP_MD *)EVP_get_digestbyname(name)) != NULL) {
+    if ((md = EVP_MD_fetch(app_get0_libctx(), name, app_get0_propq())) != NULL
+        || (opt_legacy_okay()
+            && (md = (EVP_MD *)EVP_get_digestbyname(name)) != NULL)) {

         ERR_pop_to_mark();
         ERR_pop_to_mark();

+        if (mdp != NULL) {
+            EVP_MD_free(*mdp);
+            *mdp = md;
+        } else {
+            EVP_MD_free(md);
+        }

         return 1;
     }
     ERR_clear_last_mark();
         return 1;
     }
     ERR_clear_last_mark();