Backport two patches from uptream to fix test failure with openssl 1.0.2b or above. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>