Cleaned up a bit more to let encrypt/decrypt take char arrays