diff options
| author | Carl Hetherington <cth@carlh.net> | 2026-03-19 22:00:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2026-03-19 22:00:10 +0100 |
| commit | 29f9e70edf4bb565e1a49f326f717f149895654f (patch) | |
| tree | 68876c053f1bd0842e9f6babcb308b3180c30ea1 | |
| parent | c81e8adf8dd6cc1c795e449c816b867d7319b78b (diff) | |
Failed attempts.fed43
| -rw-r--r-- | src/util.cc | 7 | ||||
| -rw-r--r-- | wscript | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/util.cc b/src/util.cc index 55ad0ca9..ec6ff2d6 100644 --- a/src/util.cc +++ b/src/util.cc @@ -181,12 +181,13 @@ dcp::init (optional<boost::filesystem::path> given_resources_directory) throw MiscError ("could not initialise xmlsec-crypto"); } - OpenSSL_add_all_algorithms(); - auto context = xmlSecOpenSSLGetLibCtx(); - DCP_ASSERT(context); + auto context = OSSL_LIB_CTX_new(); + xmlSecOpenSSLSetLibCtx(context); /* Enable SHA1 digests */ SSL_CTX_set_security_level(reinterpret_cast<SSL_CTX*>(context), 1); + OpenSSL_add_all_algorithms(); + asdcp_smpte_dict = &ASDCP::DefaultSMPTEDict(); auto res = given_resources_directory.get_value_or(resources_directory()); @@ -148,7 +148,7 @@ def configure(conf): mandatory=False) conf.check_cfg(package='libxml++-' + conf.env.XMLPP_API, args='--cflags --libs', uselib_store='LIBXML++', mandatory=True) - conf.check_cfg(package='xmlsec1-openssl', args='--cflags --libs', uselib_store='XMLSEC1', mandatory=True) + conf.check_cfg(package='xmlsec1', args='--cflags --libs', uselib_store='XMLSEC1', mandatory=True) # Remove erroneous escaping of quotes from xmlsec1 defines conf.env.DEFINES_XMLSEC1 = [f.replace('\\', '') for f in conf.env.DEFINES_XMLSEC1] |