summaryrefslogtreecommitdiff
path: root/crypto/property/property_local.h
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2020-06-12 10:34:46 +1000
committerPauli <paul.dale@oracle.com>2020-06-23 21:44:47 +1000
commitf9e504e8b1d4da4b8c9c16ee4c11e9815a800422 (patch)
treea53b2ee1974b87cdc17f3367338ef4f8abead154 /crypto/property/property_local.h
parent1b495200436b57309ca958a7a72affaf75171c1a (diff)
downloadopenssl-new-f9e504e8b1d4da4b8c9c16ee4c11e9815a800422.tar.gz
property: Move global default properties to the library context.
Fixes a problem where global properties don't work with a NULL query. Specifying an algorithm with a NULL query ignores the default properties. Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12123)
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);