Added two-parameter versions of the crypto-functions