Merge branch 'maint-0.4.1' into maint-0.4.2

diff --cc src/lib/crypt_ops/crypto_rsa_openssl.c
Simple merge

diff --cc src/test/test_crypto.c
Simple merge