socat 1.7.3.1 build failure with openssl-devel-1:1.1.0c-3 as tried by scratchbuild (1)

The RAND_F_SSLEAY_RAND_BYTES error may be solved by a patch like (2)
But I do not identified a solution for incomplete type 'DH' error.


(1) https://kojipkgs.fedoraproject.org//work/tasks/4505/16864505/build.log
=== extract
-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m32 -march=i686 -fasynchronous-unwind-tables -D_GNU_SOURCE -Wall -Wno-parentheses  -DHAVE_CONFIG_H -I.  -I.   -c -o xio-tun.o xio-tun.c
xio-openssl.c: In function '_xioopen_openssl_prepare':
xio-openssl.c:948:5: error: dereferencing pointer to incomplete type 'DH {aka struct dh_st}'
   dh->p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
     ^~
xio-openssl.c: In function 'openssl_SSL_ERROR_SSL':
xio-openssl.c:1106:4: error: 'RAND_F_SSLEAY_RAND_BYTES' undeclared (first use in this function)
   (RAND_F_SSLEAY_RAND_BYTES<<12)|
    ^~~~~~~~~~~~~~~~~~~~~~~~
===

(2)
===
Index: socat-1.7.3.1/xio-openssl.c
===================================================================
--- socat-1.7.3.1.orig/xio-openssl.c
+++ socat-1.7.3.1/xio-openssl.c
@@ -16,6 +16,9 @@
 #include "xio-listen.h"
 #include "xio-ipapp.h"
 #include "xio-openssl.h"
+#ifndef RAND_F_SSLEAY_RAND_BYTES
+#define RAND_F_SSLEAY_RAND_BYTES RAND_F_RAND_BYTES
+#endif
===