diff options
| -rw-r--r-- | crypto/property/property_local.h | 9 | ||||
| -rw-r--r-- | include/internal/property.h | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/crypto/property/property_local.h b/crypto/property/property_local.h index 25cfde4649..950a0c6c07 100644 --- a/crypto/property/property_local.h +++ b/crypto/property/property_local.h @@ -11,7 +11,6 @@ #include <openssl/crypto.h> #include "internal/property.h" -typedef struct ossl_property_list_st OSSL_PROPERTY_LIST; typedef int OSSL_PROPERTY_IDX; /* Property string functions */ @@ -23,17 +22,9 @@ OSSL_PROPERTY_IDX ossl_property_value(OPENSSL_CTX *ctx, const char *s, /* Property list functions */ void ossl_property_free(OSSL_PROPERTY_LIST *p); int ossl_property_has_optional(const OSSL_PROPERTY_LIST *query); -int ossl_property_match_count(const OSSL_PROPERTY_LIST *query, - const OSSL_PROPERTY_LIST *defn); OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a, const OSSL_PROPERTY_LIST *b); -/* Property definition functions */ -OSSL_PROPERTY_LIST *ossl_parse_property(OPENSSL_CTX *ctx, const char *s); - -/* Property query functions */ -OSSL_PROPERTY_LIST *ossl_parse_query(OPENSSL_CTX *ctx, const char *s); - /* Property definition cache functions */ OSSL_PROPERTY_LIST *ossl_prop_defn_get(OPENSSL_CTX *ctx, const char *prop); int ossl_prop_defn_set(OPENSSL_CTX *ctx, const char *prop, diff --git a/include/internal/property.h b/include/internal/property.h index 7ffd588073..1c40351e83 100644 --- a/include/internal/property.h +++ b/include/internal/property.h @@ -14,10 +14,19 @@ #include "internal/cryptlib.h" typedef struct ossl_method_store_st OSSL_METHOD_STORE; +typedef struct ossl_property_list_st OSSL_PROPERTY_LIST; /* Initialisation */ int ossl_property_parse_init(OPENSSL_CTX *ctx); +/* Property definition parser */ +OSSL_PROPERTY_LIST *ossl_parse_property(OPENSSL_CTX *ctx, const char *defn); +/* Property query parser */ +OSSL_PROPERTY_LIST *ossl_parse_query(OPENSSL_CTX *ctx, const char *s); +/* Property checker of query vs definition */ +int ossl_property_match_count(const OSSL_PROPERTY_LIST *query, + const OSSL_PROPERTY_LIST *defn); + /* Implementation store functions */ OSSL_METHOD_STORE *ossl_method_store_new(OPENSSL_CTX *ctx); void ossl_method_store_free(OSSL_METHOD_STORE *store); |