Upstream is currently in the painful process of adapting their code to OpenSSL 3.0. This diff clashes with those efforts. I'll upstram a version once the dust will have settled.