Following running openssl-format-source there were a lot of manual tweaks
that were requried.
Reviewed-by: NBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5105)