FIPS 140-2 "ready" branch

Merging into `fips` branch of upstream...