X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=apps%2Flist.c;h=30bf2be919f6e580b03c0cda52c6971f83313f91;hb=15b7175f558bf9eb057ec3266685486f727dd70f;hp=bc21c7f18ac4f86e272cf59c4debc10dad2f9785;hpb=ed576acdf591d4164905ab98e89ca5a3b99d90ab;p=openssl.git diff --git a/apps/list.c b/apps/list.c index bc21c7f18a..30bf2be919 100644 --- a/apps/list.c +++ b/apps/list.c @@ -36,10 +36,11 @@ static const char *select_name = NULL; { \ TYPE *impl; \ const char *propq = app_get0_propq(); \ + OSSL_LIB_CTX *libctx = app_get0_libctx(); \ const char *name = TYPE ## _get0_name(alg); \ \ ERR_set_mark(); \ - impl = TYPE ## _fetch(NULL, name, propq); \ + impl = TYPE ## _fetch(libctx, name, propq); \ ERR_pop_to_mark(); \ if (impl == NULL) \ return 0; \ @@ -88,13 +89,8 @@ DEFINE_STACK_OF(EVP_CIPHER) static int cipher_cmp(const EVP_CIPHER * const *a, const EVP_CIPHER * const *b) { - int ret = EVP_CIPHER_get_number(*a) - EVP_CIPHER_get_number(*b); - - if (ret == 0) - ret = strcmp(OSSL_PROVIDER_name(EVP_CIPHER_get0_provider(*a)), - OSSL_PROVIDER_name(EVP_CIPHER_get0_provider(*b))); - - return ret; + return strcmp(OSSL_PROVIDER_get0_name(EVP_CIPHER_get0_provider(*a)), + OSSL_PROVIDER_get0_name(EVP_CIPHER_get0_provider(*b))); } static void collect_ciphers(EVP_CIPHER *cipher, void *stack) @@ -123,7 +119,7 @@ static void list_ciphers(void) #endif BIO_printf(bio_out, "Provided:\n"); - EVP_CIPHER_do_all_provided(NULL, collect_ciphers, ciphers); + EVP_CIPHER_do_all_provided(app_get0_libctx(), collect_ciphers, ciphers); sk_EVP_CIPHER_sort(ciphers); for (i = 0; i < sk_EVP_CIPHER_num(ciphers); i++) { const EVP_CIPHER *c = sk_EVP_CIPHER_value(ciphers, i); @@ -138,7 +134,7 @@ static void list_ciphers(void) print_names(bio_out, names); BIO_printf(bio_out, " @ %s\n", - OSSL_PROVIDER_name(EVP_CIPHER_get0_provider(c))); + OSSL_PROVIDER_get0_name(EVP_CIPHER_get0_provider(c))); if (verbose) { const char *desc = EVP_CIPHER_get0_description(c); @@ -177,13 +173,8 @@ static void legacy_md_fn(const EVP_MD *m, DEFINE_STACK_OF(EVP_MD) static int md_cmp(const EVP_MD * const *a, const EVP_MD * const *b) { - int ret = EVP_MD_get_number(*a) - EVP_MD_get_number(*b); - - if (ret == 0) - ret = strcmp(OSSL_PROVIDER_name(EVP_MD_get0_provider(*a)), - OSSL_PROVIDER_name(EVP_MD_get0_provider(*b))); - - return ret; + return strcmp(OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(*a)), + OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(*b))); } static void collect_digests(EVP_MD *digest, void *stack) @@ -212,7 +203,7 @@ static void list_digests(void) #endif BIO_printf(bio_out, "Provided:\n"); - EVP_MD_do_all_provided(NULL, collect_digests, digests); + EVP_MD_do_all_provided(app_get0_libctx(), collect_digests, digests); sk_EVP_MD_sort(digests); for (i = 0; i < sk_EVP_MD_num(digests); i++) { const EVP_MD *m = sk_EVP_MD_value(digests, i); @@ -227,7 +218,7 @@ static void list_digests(void) print_names(bio_out, names); BIO_printf(bio_out, " @ %s\n", - OSSL_PROVIDER_name(EVP_MD_get0_provider(m))); + OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(m))); if (verbose) { const char *desc = EVP_MD_get0_description(m); @@ -250,13 +241,8 @@ static void list_digests(void) DEFINE_STACK_OF(EVP_MAC) static int mac_cmp(const EVP_MAC * const *a, const EVP_MAC * const *b) { - int ret = EVP_MAC_get_number(*a) - EVP_MAC_get_number(*b); - - if (ret == 0) - ret = strcmp(OSSL_PROVIDER_name(EVP_MAC_get0_provider(*a)), - OSSL_PROVIDER_name(EVP_MAC_get0_provider(*b))); - - return ret; + return strcmp(OSSL_PROVIDER_get0_name(EVP_MAC_get0_provider(*a)), + OSSL_PROVIDER_get0_name(EVP_MAC_get0_provider(*b))); } static void collect_macs(EVP_MAC *mac, void *stack) @@ -278,7 +264,7 @@ static void list_macs(void) return; } BIO_printf(bio_out, "Provided MACs:\n"); - EVP_MAC_do_all_provided(NULL, collect_macs, macs); + EVP_MAC_do_all_provided(app_get0_libctx(), collect_macs, macs); sk_EVP_MAC_sort(macs); for (i = 0; i < sk_EVP_MAC_num(macs); i++) { const EVP_MAC *m = sk_EVP_MAC_value(macs, i); @@ -293,7 +279,7 @@ static void list_macs(void) print_names(bio_out, names); BIO_printf(bio_out, " @ %s\n", - OSSL_PROVIDER_name(EVP_MAC_get0_provider(m))); + OSSL_PROVIDER_get0_name(EVP_MAC_get0_provider(m))); if (verbose) { const char *desc = EVP_MAC_get0_description(m); @@ -319,13 +305,8 @@ static void list_macs(void) DEFINE_STACK_OF(EVP_KDF) static int kdf_cmp(const EVP_KDF * const *a, const EVP_KDF * const *b) { - int ret = EVP_KDF_get_number(*a) - EVP_KDF_get_number(*b); - - if (ret == 0) - ret = strcmp(OSSL_PROVIDER_name(EVP_KDF_get0_provider(*a)), - OSSL_PROVIDER_name(EVP_KDF_get0_provider(*b))); - - return ret; + return strcmp(OSSL_PROVIDER_get0_name(EVP_KDF_get0_provider(*a)), + OSSL_PROVIDER_get0_name(EVP_KDF_get0_provider(*b))); } static void collect_kdfs(EVP_KDF *kdf, void *stack) @@ -347,7 +328,7 @@ static void list_kdfs(void) return; } BIO_printf(bio_out, "Provided KDFs and PDFs:\n"); - EVP_KDF_do_all_provided(NULL, collect_kdfs, kdfs); + EVP_KDF_do_all_provided(app_get0_libctx(), collect_kdfs, kdfs); sk_EVP_KDF_sort(kdfs); for (i = 0; i < sk_EVP_KDF_num(kdfs); i++) { const EVP_KDF *k = sk_EVP_KDF_value(kdfs, i); @@ -362,7 +343,7 @@ static void list_kdfs(void) print_names(bio_out, names); BIO_printf(bio_out, " @ %s\n", - OSSL_PROVIDER_name(EVP_KDF_get0_provider(k))); + OSSL_PROVIDER_get0_name(EVP_KDF_get0_provider(k))); if (verbose) { const char *desc = EVP_KDF_get0_description(k); @@ -392,8 +373,8 @@ static int rand_cmp(const EVP_RAND * const *a, const EVP_RAND * const *b) int ret = strcasecmp(EVP_RAND_get0_name(*a), EVP_RAND_get0_name(*b)); if (ret == 0) - ret = strcmp(OSSL_PROVIDER_name(EVP_RAND_get0_provider(*a)), - OSSL_PROVIDER_name(EVP_RAND_get0_provider(*b))); + ret = strcmp(OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(*a)), + OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(*b))); return ret; } @@ -417,7 +398,7 @@ static void list_random_generators(void) return; } BIO_printf(bio_out, "Provided RNGs and seed sources:\n"); - EVP_RAND_do_all_provided(NULL, collect_rands, rands); + EVP_RAND_do_all_provided(app_get0_libctx(), collect_rands, rands); sk_EVP_RAND_sort(rands); for (i = 0; i < sk_EVP_RAND_num(rands); i++) { const EVP_RAND *m = sk_EVP_RAND_value(rands, i); @@ -427,7 +408,7 @@ static void list_random_generators(void) continue; BIO_printf(bio_out, " %s", EVP_RAND_get0_name(m)); BIO_printf(bio_out, " @ %s\n", - OSSL_PROVIDER_name(EVP_RAND_get0_provider(m))); + OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(m))); if (verbose) { const char *desc = EVP_RAND_get0_description(m); @@ -460,7 +441,7 @@ static void display_random(const char *name, EVP_RAND_CTX *drbg) BIO_printf(bio_out, " %s", EVP_RAND_get0_name(rand)); BIO_printf(bio_out, " @ %s\n", - OSSL_PROVIDER_name(EVP_RAND_get0_provider(rand))); + OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(rand))); switch (EVP_RAND_get_state(drbg)) { case EVP_RAND_STATE_UNINITIALISED: @@ -520,12 +501,8 @@ DEFINE_STACK_OF(OSSL_ENCODER) static int encoder_cmp(const OSSL_ENCODER * const *a, const OSSL_ENCODER * const *b) { - int ret = OSSL_ENCODER_get_number(*a) - OSSL_ENCODER_get_number(*b); - - if (ret == 0) - ret = strcmp(OSSL_PROVIDER_name(OSSL_ENCODER_get0_provider(*a)), - OSSL_PROVIDER_name(OSSL_ENCODER_get0_provider(*b))); - return ret; + return strcmp(OSSL_PROVIDER_get0_name(OSSL_ENCODER_get0_provider(*a)), + OSSL_PROVIDER_get0_name(OSSL_ENCODER_get0_provider(*b))); } static void collect_encoders(OSSL_ENCODER *encoder, void *stack) @@ -548,7 +525,8 @@ static void list_encoders(void) return; } BIO_printf(bio_out, "Provided ENCODERs:\n"); - OSSL_ENCODER_do_all_provided(NULL, collect_encoders, encoders); + OSSL_ENCODER_do_all_provided(app_get0_libctx(), collect_encoders, + encoders); sk_OSSL_ENCODER_sort(encoders); for (i = 0; i < sk_OSSL_ENCODER_num(encoders); i++) { @@ -564,7 +542,7 @@ static void list_encoders(void) print_names(bio_out, names); BIO_printf(bio_out, " @ %s (%s)\n", - OSSL_PROVIDER_name(OSSL_ENCODER_get0_provider(k)), + OSSL_PROVIDER_get0_name(OSSL_ENCODER_get0_provider(k)), OSSL_ENCODER_get0_properties(k)); if (verbose) { @@ -588,12 +566,8 @@ DEFINE_STACK_OF(OSSL_DECODER) static int decoder_cmp(const OSSL_DECODER * const *a, const OSSL_DECODER * const *b) { - int ret = OSSL_DECODER_get_number(*a) - OSSL_DECODER_get_number(*b); - - if (ret == 0) - ret = strcmp(OSSL_PROVIDER_name(OSSL_DECODER_get0_provider(*a)), - OSSL_PROVIDER_name(OSSL_DECODER_get0_provider(*b))); - return ret; + return strcmp(OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(*a)), + OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(*b))); } static void collect_decoders(OSSL_DECODER *decoder, void *stack) @@ -616,7 +590,7 @@ static void list_decoders(void) return; } BIO_printf(bio_out, "Provided DECODERs:\n"); - OSSL_DECODER_do_all_provided(NULL, collect_decoders, + OSSL_DECODER_do_all_provided(app_get0_libctx(), collect_decoders, decoders); sk_OSSL_DECODER_sort(decoders); @@ -633,7 +607,7 @@ static void list_decoders(void) print_names(bio_out, names); BIO_printf(bio_out, " @ %s (%s)\n", - OSSL_PROVIDER_name(OSSL_DECODER_get0_provider(k)), + OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(k)), OSSL_DECODER_get0_properties(k)); if (verbose) { @@ -654,12 +628,8 @@ DEFINE_STACK_OF(EVP_KEYMGMT) static int keymanager_cmp(const EVP_KEYMGMT * const *a, const EVP_KEYMGMT * const *b) { - int ret = EVP_KEYMGMT_get_number(*a) - EVP_KEYMGMT_get_number(*b); - - if (ret == 0) - ret = strcmp(OSSL_PROVIDER_name(EVP_KEYMGMT_get0_provider(*a)), - OSSL_PROVIDER_name(EVP_KEYMGMT_get0_provider(*b))); - return ret; + return strcmp(OSSL_PROVIDER_get0_name(EVP_KEYMGMT_get0_provider(*a)), + OSSL_PROVIDER_get0_name(EVP_KEYMGMT_get0_provider(*b))); } static void collect_keymanagers(EVP_KEYMGMT *km, void *stack) @@ -676,7 +646,8 @@ static void list_keymanagers(void) int i; STACK_OF(EVP_KEYMGMT) *km_stack = sk_EVP_KEYMGMT_new(keymanager_cmp); - EVP_KEYMGMT_do_all_provided(NULL, collect_keymanagers, km_stack); + EVP_KEYMGMT_do_all_provided(app_get0_libctx(), collect_keymanagers, + km_stack); sk_EVP_KEYMGMT_sort(km_stack); for (i = 0; i < sk_EVP_KEYMGMT_num(km_stack); i++) { @@ -700,7 +671,7 @@ static void list_keymanagers(void) BIO_printf(bio_out, " IDs: "); print_names(bio_out, names); BIO_printf(bio_out, " @ %s\n", - OSSL_PROVIDER_name(EVP_KEYMGMT_get0_provider(k))); + OSSL_PROVIDER_get0_name(EVP_KEYMGMT_get0_provider(k))); if (verbose) { print_param_types("settable key generation parameters", @@ -720,12 +691,8 @@ DEFINE_STACK_OF(EVP_SIGNATURE) static int signature_cmp(const EVP_SIGNATURE * const *a, const EVP_SIGNATURE * const *b) { - int ret = EVP_SIGNATURE_get_number(*a) - EVP_SIGNATURE_get_number(*b); - - if (ret == 0) - ret = strcmp(OSSL_PROVIDER_name(EVP_SIGNATURE_get0_provider(*a)), - OSSL_PROVIDER_name(EVP_SIGNATURE_get0_provider(*b))); - return ret; + return strcmp(OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(*a)), + OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(*b))); } static void collect_signatures(EVP_SIGNATURE *sig, void *stack) @@ -742,7 +709,8 @@ static void list_signatures(void) int i, count = 0; STACK_OF(EVP_SIGNATURE) *sig_stack = sk_EVP_SIGNATURE_new(signature_cmp); - EVP_SIGNATURE_do_all_provided(NULL, collect_signatures, sig_stack); + EVP_SIGNATURE_do_all_provided(app_get0_libctx(), collect_signatures, + sig_stack); sk_EVP_SIGNATURE_sort(sig_stack); for (i = 0; i < sk_EVP_SIGNATURE_num(sig_stack); i++) { @@ -759,7 +727,7 @@ static void list_signatures(void) print_names(bio_out, names); BIO_printf(bio_out, " @ %s\n", - OSSL_PROVIDER_name(EVP_SIGNATURE_get0_provider(k))); + OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(k))); if (verbose) { const char *desc = EVP_SIGNATURE_get0_description(k); @@ -783,12 +751,8 @@ DEFINE_STACK_OF(EVP_KEM) static int kem_cmp(const EVP_KEM * const *a, const EVP_KEM * const *b) { - int ret = EVP_KEM_get_number(*a) - EVP_KEM_get_number(*b); - - if (ret == 0) - ret = strcmp(OSSL_PROVIDER_name(EVP_KEM_get0_provider(*a)), - OSSL_PROVIDER_name(EVP_KEM_get0_provider(*b))); - return ret; + return strcmp(OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(*a)), + OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(*b))); } static void collect_kem(EVP_KEM *kem, void *stack) @@ -805,7 +769,7 @@ static void list_kems(void) int i, count = 0; STACK_OF(EVP_KEM) *kem_stack = sk_EVP_KEM_new(kem_cmp); - EVP_KEM_do_all_provided(NULL, collect_kem, kem_stack); + EVP_KEM_do_all_provided(app_get0_libctx(), collect_kem, kem_stack); sk_EVP_KEM_sort(kem_stack); for (i = 0; i < sk_EVP_KEM_num(kem_stack); i++) { @@ -822,7 +786,7 @@ static void list_kems(void) print_names(bio_out, names); BIO_printf(bio_out, " @ %s\n", - OSSL_PROVIDER_name(EVP_KEM_get0_provider(k))); + OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(k))); if (verbose) { const char *desc = EVP_KEM_get0_description(k); @@ -846,12 +810,8 @@ DEFINE_STACK_OF(EVP_ASYM_CIPHER) static int asymcipher_cmp(const EVP_ASYM_CIPHER * const *a, const EVP_ASYM_CIPHER * const *b) { - int ret = EVP_ASYM_CIPHER_get_number(*a) - EVP_ASYM_CIPHER_get_number(*b); - - if (ret == 0) - ret = strcmp(OSSL_PROVIDER_name(EVP_ASYM_CIPHER_get0_provider(*a)), - OSSL_PROVIDER_name(EVP_ASYM_CIPHER_get0_provider(*b))); - return ret; + return strcmp(OSSL_PROVIDER_get0_name(EVP_ASYM_CIPHER_get0_provider(*a)), + OSSL_PROVIDER_get0_name(EVP_ASYM_CIPHER_get0_provider(*b))); } static void collect_asymciph(EVP_ASYM_CIPHER *asym_cipher, void *stack) @@ -869,7 +829,8 @@ static void list_asymciphers(void) STACK_OF(EVP_ASYM_CIPHER) *asymciph_stack = sk_EVP_ASYM_CIPHER_new(asymcipher_cmp); - EVP_ASYM_CIPHER_do_all_provided(NULL, collect_asymciph, asymciph_stack); + EVP_ASYM_CIPHER_do_all_provided(app_get0_libctx(), collect_asymciph, + asymciph_stack); sk_EVP_ASYM_CIPHER_sort(asymciph_stack); for (i = 0; i < sk_EVP_ASYM_CIPHER_num(asymciph_stack); i++) { @@ -887,7 +848,7 @@ static void list_asymciphers(void) print_names(bio_out, names); BIO_printf(bio_out, " @ %s\n", - OSSL_PROVIDER_name(EVP_ASYM_CIPHER_get0_provider(k))); + OSSL_PROVIDER_get0_name(EVP_ASYM_CIPHER_get0_provider(k))); if (verbose) { const char *desc = EVP_ASYM_CIPHER_get0_description(k); @@ -911,12 +872,8 @@ DEFINE_STACK_OF(EVP_KEYEXCH) static int kex_cmp(const EVP_KEYEXCH * const *a, const EVP_KEYEXCH * const *b) { - int ret = EVP_KEYEXCH_get_number(*a) - EVP_KEYEXCH_get_number(*b); - - if (ret == 0) - ret = strcmp(OSSL_PROVIDER_name(EVP_KEYEXCH_get0_provider(*a)), - OSSL_PROVIDER_name(EVP_KEYEXCH_get0_provider(*b))); - return ret; + return strcmp(OSSL_PROVIDER_get0_name(EVP_KEYEXCH_get0_provider(*a)), + OSSL_PROVIDER_get0_name(EVP_KEYEXCH_get0_provider(*b))); } static void collect_kex(EVP_KEYEXCH *kex, void *stack) @@ -933,7 +890,7 @@ static void list_keyexchanges(void) int i, count = 0; STACK_OF(EVP_KEYEXCH) *kex_stack = sk_EVP_KEYEXCH_new(kex_cmp); - EVP_KEYEXCH_do_all_provided(NULL, collect_kex, kex_stack); + EVP_KEYEXCH_do_all_provided(app_get0_libctx(), collect_kex, kex_stack); sk_EVP_KEYEXCH_sort(kex_stack); for (i = 0; i < sk_EVP_KEYEXCH_num(kex_stack); i++) { @@ -950,7 +907,7 @@ static void list_keyexchanges(void) print_names(bio_out, names); BIO_printf(bio_out, " @ %s\n", - OSSL_PROVIDER_name(EVP_KEYEXCH_get0_provider(k))); + OSSL_PROVIDER_get0_name(EVP_KEYEXCH_get0_provider(k))); if (verbose) { const char *desc = EVP_KEYEXCH_get0_description(k); @@ -1061,7 +1018,7 @@ static int is_md_available(const char *name) /* Look through providers' digests */ ERR_set_mark(); - md = EVP_MD_fetch(NULL, name, propq); + md = EVP_MD_fetch(app_get0_libctx(), name, propq); ERR_pop_to_mark(); if (md != NULL) { EVP_MD_free(md); @@ -1078,7 +1035,7 @@ static int is_cipher_available(const char *name) /* Look through providers' ciphers */ ERR_set_mark(); - cipher = EVP_CIPHER_fetch(NULL, name, propq); + cipher = EVP_CIPHER_fetch(app_get0_libctx(), name, propq); ERR_pop_to_mark(); if (cipher != NULL) { EVP_CIPHER_free(cipher); @@ -1196,13 +1153,8 @@ DEFINE_STACK_OF(OSSL_STORE_LOADER) static int store_cmp(const OSSL_STORE_LOADER * const *a, const OSSL_STORE_LOADER * const *b) { - int ret = OSSL_STORE_LOADER_get_number(*a) - OSSL_STORE_LOADER_get_number(*b); - - if (ret == 0) - ret = strcmp(OSSL_PROVIDER_name(OSSL_STORE_LOADER_get0_provider(*a)), - OSSL_PROVIDER_name(OSSL_STORE_LOADER_get0_provider(*b))); - - return ret; + return strcmp(OSSL_PROVIDER_get0_name(OSSL_STORE_LOADER_get0_provider(*a)), + OSSL_PROVIDER_get0_name(OSSL_STORE_LOADER_get0_provider(*b))); } static void collect_store_loaders(OSSL_STORE_LOADER *store, void *stack) @@ -1223,7 +1175,8 @@ static void list_store_loaders(void) return; } BIO_printf(bio_out, "Provided STORE LOADERs:\n"); - OSSL_STORE_LOADER_do_all_provided(NULL, collect_store_loaders, stores); + OSSL_STORE_LOADER_do_all_provided(app_get0_libctx(), collect_store_loaders, + stores); sk_OSSL_STORE_LOADER_sort(stores); for (i = 0; i < sk_OSSL_STORE_LOADER_num(stores); i++) { const OSSL_STORE_LOADER *m = sk_OSSL_STORE_LOADER_value(stores, i); @@ -1239,7 +1192,7 @@ static void list_store_loaders(void) print_names(bio_out, names); BIO_printf(bio_out, " @ %s\n", - OSSL_PROVIDER_name(OSSL_STORE_LOADER_get0_provider(m))); + OSSL_PROVIDER_get0_name(OSSL_STORE_LOADER_get0_provider(m))); } sk_OPENSSL_CSTRING_free(names); } @@ -1250,7 +1203,7 @@ DEFINE_STACK_OF(OSSL_PROVIDER) static int provider_cmp(const OSSL_PROVIDER * const *a, const OSSL_PROVIDER * const *b) { - return strcmp(OSSL_PROVIDER_name(*a), OSSL_PROVIDER_name(*b)); + return strcmp(OSSL_PROVIDER_get0_name(*a), OSSL_PROVIDER_get0_name(*b)); } static int collect_providers(OSSL_PROVIDER *provider, void *stack) @@ -1295,7 +1248,7 @@ static void list_provider_info(void) } /* Print out the provider information, the params order matches above */ - BIO_printf(bio_out, " %s\n", OSSL_PROVIDER_name(prov)); + BIO_printf(bio_out, " %s\n", OSSL_PROVIDER_get0_name(prov)); if (OSSL_PARAM_modified(params)) BIO_printf(bio_out, " name: %s\n", name); if (OSSL_PARAM_modified(params + 1)) @@ -1694,7 +1647,7 @@ opthelp: } /* No extra arguments. */ - if (opt_num_rest() != 0) + if (!opt_check_rest_arg(NULL)) goto opthelp; if (todo.commands)