on OpenSSL locking code. Use API in some internal FIPS files. Remove redundant ENGINE defines from fips.h