Convert the ENGINE_CONF trace calls to use CONF instead
authorRichard Levitte <levitte@openssl.org>
Fri, 5 Apr 2019 09:20:28 +0000 (11:20 +0200)
committerRichard Levitte <levitte@openssl.org>
Fri, 5 Apr 2019 10:50:55 +0000 (12:50 +0200)
commitbc362b9b72021c2a066102f4f6bee5afc981e07a
treeee28ae56a88604e650e10ef55ce21f5b7db1175f
parent0196ad63d385bcf4382266268d5be074461d3739
Convert the ENGINE_CONF trace calls to use CONF instead

Additionally, merge ENGINE_CONF into CONF.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/8680)
crypto/engine/eng_cnf.c
crypto/trace.c
include/openssl/trace.h