I think so. But all the bouncy castle stuff and how it interacts with FIPS is still confusing to me