property: move additional query functions to property_query.c

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15614)

diff --git a/crypto/property/build.info b/crypto/property/build.info
index dac9ab7a3bc84d72fdfe3a156505411211b625fd..12a6b8c9de22a7559bb0b730ec4dc662a40c6586 100644 (file)
--- a/crypto/property/build.info
+++ b/crypto/property/build.info
@@ -2,4 +2,3 @@ LIBS=../../libcrypto
 $COMMON=property_string.c property_parse.c property_query.c property.c defn_cache.c
 SOURCE[../../libcrypto]=$COMMON property_err.c
 SOURCE[../../providers/libfips.a]=$COMMON
-SOURCE[../../providers/liblegacy.a]=$COMMON

diff --git a/crypto/property/property_local.h b/crypto/property/property_local.h
index 5bb48a6f37eedced473a33f73c896ec7d2dcb9f0..46c5dbe3cc39628437d2e87179b9f504f04e0837 100644 (file)
--- a/crypto/property/property_local.h
+++ b/crypto/property/property_local.h
@@ -34,6 +34,8 @@ struct ossl_property_list_st {
     OSSL_PROPERTY_DEFINITION properties[1];
 };
 
+extern OSSL_PROPERTY_IDX ossl_property_true, ossl_property_false;
+
 /* Property string functions */
 OSSL_PROPERTY_IDX ossl_property_name(OSSL_LIB_CTX *ctx, const char *s,
                                      int create);

diff --git a/crypto/property/property_parse.c b/crypto/property/property_parse.c
index 28822ec42cdc9d1236cf3c29f8f7f905ab088a7c..21228b4a398944be0258cf2ad8ae38e8e4b53e8d 100644 (file)
--- a/crypto/property/property_parse.c
+++ b/crypto/property/property_parse.c
@@ -19,7 +19,7 @@
 #include "property_local.h"
 #include "e_os.h"
 
-static OSSL_PROPERTY_IDX ossl_property_true, ossl_property_false;
+OSSL_PROPERTY_IDX ossl_property_true, ossl_property_false;
 
 DEFINE_STACK_OF(OSSL_PROPERTY_DEFINITION)
 
@@ -422,28 +422,6 @@ err:
     return res;
 }
 
-/* Does a property query have any optional clauses */
-int ossl_property_has_optional(const OSSL_PROPERTY_LIST *query)
-{
-    return query->has_optional ? 1 : 0;
-}
-
-int ossl_property_is_enabled(OSSL_LIB_CTX *ctx,  const char *property_name,
-                             const OSSL_PROPERTY_LIST *prop_list)
-{
-    const OSSL_PROPERTY_DEFINITION *prop;
-
-    prop = ossl_property_find_property(prop_list, ctx, property_name);
-    /* Do a separate check for override as it does not set type */
-    if (prop == NULL || prop->optional || prop->oper == OSSL_PROPERTY_OVERRIDE)
-        return 0;
-    return (prop->type == OSSL_PROPERTY_TYPE_STRING
-            && ((prop->oper == OSSL_PROPERTY_OPER_EQ
-                     && prop->v.str_val == ossl_property_true)
-                 || (prop->oper == OSSL_PROPERTY_OPER_NE
-                     && prop->v.str_val != ossl_property_true)));
-}
-
 /*
  * Compare a query against a definition.
  * Return the number of clauses matched or -1 if a mandatory clause is false.

diff --git a/crypto/property/property_query.c b/crypto/property/property_query.c
index c4c6b1a22fda8f09585af5032550b981e85a5367..1352bc009eee8bf22da9dade90006fe0c707042a 100644 (file)
--- a/crypto/property/property_query.c
+++ b/crypto/property/property_query.c
@@ -58,3 +58,25 @@ int64_t ossl_property_get_number_value(const OSSL_PROPERTY_DEFINITION *prop)
     return value;
 }
 
+/* Does a property query have any optional clauses */
+int ossl_property_has_optional(const OSSL_PROPERTY_LIST *query)
+{
+    return query->has_optional ? 1 : 0;
+}
+
+int ossl_property_is_enabled(OSSL_LIB_CTX *ctx,  const char *property_name,
+                             const OSSL_PROPERTY_LIST *prop_list)
+{
+    const OSSL_PROPERTY_DEFINITION *prop;
+
+    prop = ossl_property_find_property(prop_list, ctx, property_name);
+    /* Do a separate check for override as it does not set type */
+    if (prop == NULL || prop->optional || prop->oper == OSSL_PROPERTY_OVERRIDE)
+        return 0;
+    return (prop->type == OSSL_PROPERTY_TYPE_STRING
+            && ((prop->oper == OSSL_PROPERTY_OPER_EQ
+                     && prop->v.str_val == ossl_property_true)
+                 || (prop->oper == OSSL_PROPERTY_OPER_NE
+                     && prop->v.str_val != ossl_property_true)));
+}
+