Extend and improve cipher status checking