summaryrefslogtreecommitdiffstats
path: root/crypto/property/property_local.h
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/property/property_local.h')
-rw-r--r--crypto/property/property_local.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/crypto/property/property_local.h b/crypto/property/property_local.h
index 950a0c6c07..2b5a1e663e 100644
--- a/crypto/property/property_local.h
+++ b/crypto/property/property_local.h
@@ -22,8 +22,6 @@ 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);
-OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a,
- const OSSL_PROPERTY_LIST *b);
/* Property definition cache functions */
OSSL_PROPERTY_LIST *ossl_prop_defn_get(OPENSSL_CTX *ctx, const char *prop);