Reviewed-by: NBernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: NNicola Tuveri <nicola.tuveri@ibm.com>
(Merged from https://github.com/openssl/openssl/pull/11439)