Support SM2 in apps/speed

[openssl.git] / apps / provider.c

diff --git a/apps/provider.c b/apps/provider.c
index 33f194c33226041ef9ddbc9ff9dadae164bb3700..ab91e68f431b745f36161267bfafe10fb1992e85 100644 (file)
--- a/apps/provider.c
+++ b/apps/provider.c
@@ -68,13 +68,13 @@ static void print_caps(META *meta, INFO *info)
         if (meta->first) {
             if (meta->total > 0)
                 BIO_printf(bio_out, "\n");
-            BIO_printf(bio_out, "%*s%ss:", meta->indent, " ", meta->label);
+            BIO_printf(bio_out, "%*s%ss:", meta->indent, "", meta->label);
         }
         BIO_printf(bio_out, " %s", info->name);
         break;
     case 3:
     default:
-        BIO_printf(bio_out, "%*s%s %s\n", meta->indent, " ", meta->label,
+        BIO_printf(bio_out, "%*s%s %s\n", meta->indent, "", meta->label,
                    info->name);
         print_param_types("retrievable algorithm parameters",
                           info->gettable_params, meta->subindent);
@@ -108,8 +108,8 @@ static void do_cipher(EVP_CIPHER *cipher, void *meta)
 {
     do_method(cipher, EVP_CIPHER_name(cipher),
               EVP_CIPHER_gettable_params(cipher),
-              EVP_CIPHER_CTX_gettable_params(cipher),
-              EVP_CIPHER_CTX_settable_params(cipher),
+              EVP_CIPHER_gettable_ctx_params(cipher),
+              EVP_CIPHER_settable_ctx_params(cipher),
               meta);
 }
 
@@ -117,8 +117,8 @@ static void do_digest(EVP_MD *digest, void *meta)
 {
     do_method(digest, EVP_MD_name(digest),
               EVP_MD_gettable_params(digest),
-              EVP_MD_CTX_gettable_params(digest),
-              EVP_MD_CTX_settable_params(digest),
+              EVP_MD_gettable_ctx_params(digest),
+              EVP_MD_settable_ctx_params(digest),
               meta);
 }
 
@@ -126,8 +126,8 @@ static void do_mac(EVP_MAC *mac, void *meta)
 {
     do_method(mac, EVP_MAC_name(mac),
               EVP_MAC_gettable_params(mac),
-              EVP_MAC_CTX_gettable_params(mac),
-              EVP_MAC_CTX_settable_params(mac),
+              EVP_MAC_gettable_ctx_params(mac),
+              EVP_MAC_settable_ctx_params(mac),
               meta);
 }
 
@@ -165,8 +165,7 @@ int provider_main(int argc, char **argv)
     prog = opt_init(argc, argv, provider_options);
     while ((o = opt_next()) != OPT_EOF) {
         switch (o) {
-        case OPT_EOF:
-        case OPT_ERR:
+        default: /* Catching OPT_ERR & covering OPT_EOF which isn't possible */
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP: