CI_Encryption: Fix more errors and add a 'portability' test case
2 files changed