Add PKCS7 padding on encryption. Leave old way of detecting padding for now.