rsa: add ossl_ prefix to internal rsa_ calls.

[openssl.git] / providers / implementations / encode_decode / encode_key2text.c

diff --git a/providers/implementations/encode_decode/encode_key2text.c b/providers/implementations/encode_decode/encode_key2text.c
index 2cf4fab95fee307a0487cb4dc42dfbfd554f8d7e..ac6d42970e77f07b04de2d1e46061058a7ed71f7 100644 (file)
--- a/providers/implementations/encode_decode/encode_key2text.c
+++ b/providers/implementations/encode_decode/encode_key2text.c
@@ -157,7 +157,7 @@ static int ffc_params_to_text(BIO *out, const FFC_PARAMS *ffc)
 {
     if (ffc->nid != NID_undef) {
 #ifndef OPENSSL_NO_DH
-        const char *name = ffc_named_group_from_uid(ffc->nid);
+        const char *name = ossl_ffc_named_group_from_uid(ffc->nid);
 
         if (name == NULL)
             goto err;
@@ -390,23 +390,20 @@ static int ec_param_explicit_gen_to_text(BIO *out, const EC_GROUP *group,
         || EC_POINT_point2bn(group, point, form, gen, ctx) == NULL)
         return 0;
 
-    if (gen != NULL) {
-        switch (form) {
-        case POINT_CONVERSION_COMPRESSED:
-           glabel = "Generator (compressed):";
-           break;
-        case POINT_CONVERSION_UNCOMPRESSED:
-            glabel = "Generator (uncompressed):";
-            break;
-        case POINT_CONVERSION_HYBRID:
-            glabel = "Generator (hybrid):";
-            break;
-        default:
-            return 0;
-        }
-        return print_labeled_bignum(out, glabel, gen);
+    switch (form) {
+    case POINT_CONVERSION_COMPRESSED:
+       glabel = "Generator (compressed):";
+       break;
+    case POINT_CONVERSION_UNCOMPRESSED:
+        glabel = "Generator (uncompressed):";
+        break;
+    case POINT_CONVERSION_HYBRID:
+        glabel = "Generator (hybrid):";
+        break;
+    default:
+        return 0;
     }
-    return 1;
+    return print_labeled_bignum(out, glabel, gen);
 }
 
 /* Print explicit parameters */
@@ -630,7 +627,7 @@ static int rsa_to_text(BIO *out, const void *key, int selection)
     STACK_OF(BIGNUM_const) *exps = NULL;
     STACK_OF(BIGNUM_const) *coeffs = NULL;
     int primes;
-    const RSA_PSS_PARAMS_30 *pss_params = rsa_get0_pss_params_30((RSA *)rsa);
+    const RSA_PSS_PARAMS_30 *pss_params = ossl_rsa_get0_pss_params_30((RSA *)rsa);
     int ret = 0;
 
     if (out == NULL || rsa == NULL) {
@@ -658,7 +655,7 @@ static int rsa_to_text(BIO *out, const void *key, int selection)
     }
 
     RSA_get0_key(rsa, &rsa_n, &rsa_e, &rsa_d);
-    rsa_get0_all_params((RSA *)rsa, factors, exps, coeffs);
+    ossl_rsa_get0_all_params((RSA *)rsa, factors, exps, coeffs);
     primes = sk_BIGNUM_const_num(factors);
 
     if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
@@ -717,33 +714,35 @@ static int rsa_to_text(BIO *out, const void *key, int selection)
     if ((selection & OSSL_KEYMGMT_SELECT_OTHER_PARAMETERS) != 0) {
         switch (RSA_test_flags(rsa, RSA_FLAG_TYPE_MASK)) {
         case RSA_FLAG_TYPE_RSA:
-            if (!rsa_pss_params_30_is_unrestricted(pss_params)) {
+            if (!ossl_rsa_pss_params_30_is_unrestricted(pss_params)) {
                 if (BIO_printf(out, "(INVALID PSS PARAMETERS)\n") <= 0)
                     goto err;
             }
             break;
         case RSA_FLAG_TYPE_RSASSAPSS:
-            if (rsa_pss_params_30_is_unrestricted(pss_params)) {
+            if (ossl_rsa_pss_params_30_is_unrestricted(pss_params)) {
                 if (BIO_printf(out, "No PSS parameter restrictions\n") <= 0)
                     goto err;
             } else {
-                int hashalg_nid = rsa_pss_params_30_hashalg(pss_params);
-                int maskgenalg_nid = rsa_pss_params_30_maskgenalg(pss_params);
+                int hashalg_nid = ossl_rsa_pss_params_30_hashalg(pss_params);
+                int maskgenalg_nid =
+                    ossl_rsa_pss_params_30_maskgenalg(pss_params);
                 int maskgenhashalg_nid =
-                    rsa_pss_params_30_maskgenhashalg(pss_params);
-                int saltlen = rsa_pss_params_30_saltlen(pss_params);
-                int trailerfield = rsa_pss_params_30_trailerfield(pss_params);
+                    ossl_rsa_pss_params_30_maskgenhashalg(pss_params);
+                int saltlen = ossl_rsa_pss_params_30_saltlen(pss_params);
+                int trailerfield =
+                    ossl_rsa_pss_params_30_trailerfield(pss_params);
 
                 if (BIO_printf(out, "PSS parameter restrictions:\n") <= 0)
                     goto err;
                 if (BIO_printf(out, "  Hash Algorithm: %s%s\n",
-                               rsa_oaeppss_nid2name(hashalg_nid),
+                               ossl_rsa_oaeppss_nid2name(hashalg_nid),
                                (hashalg_nid == NID_sha1
                                 ? " (default)" : "")) <= 0)
                     goto err;
                 if (BIO_printf(out, "  Mask Algorithm: %s with %s%s\n",
-                               rsa_mgf_nid2name(maskgenalg_nid),
-                               rsa_oaeppss_nid2name(maskgenhashalg_nid),
+                               ossl_rsa_mgf_nid2name(maskgenalg_nid),
+                               ossl_rsa_oaeppss_nid2name(maskgenhashalg_nid),
                                (maskgenalg_nid == NID_mgf1
                                 && maskgenhashalg_nid == NID_sha1
                                 ? " (default)" : "")) <= 0)
@@ -844,17 +843,17 @@ static int key2text_encode(void *vctx, const void *key, int selection,
                                                                         \
     static int impl##2text_get_params(OSSL_PARAM params[])              \
     {                                                                   \
-        return key2text_get_params(params, impl##_input_type);           \
+        return key2text_get_params(params, impl##_input_type);          \
     }                                                                   \
     static void *impl##2text_import_object(void *ctx, int selection,    \
                                            const OSSL_PARAM params[])   \
     {                                                                   \
-        return ossl_prov_import_key(impl##_keymgmt_functions,           \
+        return ossl_prov_import_key(ossl_##impl##_keymgmt_functions,    \
                                     ctx, selection, params);            \
     }                                                                   \
     static void impl##2text_free_object(void *key)                      \
     {                                                                   \
-        ossl_prov_free_key(impl##_keymgmt_functions, key);              \
+        ossl_prov_free_key(ossl_##impl##_keymgmt_functions, key);       \
     }                                                                   \
     static int impl##2text_encode(void *vctx, OSSL_CORE_BIO *cout,      \
                                   const void *key,                      \
@@ -871,7 +870,7 @@ static int key2text_encode(void *vctx, const void *key, int selection,
         return key2text_encode(vctx, key, selection, cout,              \
                                type##_to_text, cb, cbarg);              \
     }                                                                   \
-    const OSSL_DISPATCH impl##_to_text_encoder_functions[] = {          \
+    const OSSL_DISPATCH ossl_##impl##_to_text_encoder_functions[] = {   \
         { OSSL_FUNC_ENCODER_NEWCTX,                                     \
           (void (*)(void))key2text_newctx },                            \
         { OSSL_FUNC_ENCODER_FREECTX,                                    \