Merge minor FIPS branch changes: buffer, objects, pem, x509.