property: Move global default properties to the library context.

[openssl.git] / crypto / property / property_local.h

diff --git a/crypto/property/property_local.h b/crypto/property/property_local.h
index 950a0c6c0722a1e5213b19eb40b67ae6fd771420..2b5a1e663eb056245d87395a2d7ddbc4a3eb2721 100644 (file)
--- 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);