Improve cryptographic code