Fixes #13815
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14029)
* Bernd Edlinger
* Bodo Möller
* David Benjamin
+ * David von Oheimb
+ * Dmitry Belyavskiy (Дмитрий Белявский)
* Emilia Käsper
* Eric Young
* Geoff Thorpe
* Mark J. Cox
* Matt Caswell
* Matthias St. Pierre
+ * Nicola Tuveri
* Nils Larsch
+ * Patrick Steuer
* Paul Dale
* Paul C. Sutton
+ * Paul Yang
* Ralf S. Engelschall
* Rich Salz
* Richard Levitte
+ * Shane Lontis
* Stephen Henson
* Steve Marquess
* Tim Hudson
+ * Tomáš Mráz
* Ulf Möller
* Viktor Dukhovni