Merge branch 'maint-0.4.2' into maint-0.4.3

diff --cc src/feature/dirparse/parsecommon.c
Simple merge

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

diff --cc src/lib/crypt_ops/crypto_rsa.h
Simple merge

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

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

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