... making it just another context. Well, except the EVP struct has non-trivial SMFs, so adding it to the union deletes all the union's SMFs, too. To restore them, we need to give the union a class name (State). Since we anyway need to provide ctors, inline all init() functions into them. State having a ctor means we need to call it, with the method argument, in the Private ctor-init-list. That requires the State member to have a name. Since the union thus no longer defines variant members within Private, move most of the functions that operated on the variant members into State or EVP to avoid having to sprinkle state./evp.-prefixes all over the code. This gives the opportunity to re-share some code that was duplicated when we dragged #ifdef USING_OPENSSL3 out of the functions into namespace scope. The move of the functions into State robs them of their access to other Private members, to wit, 'method' and 'result', so we have to pass them as arguments now. I tried to split this up into smaller patches, but it kinda has to happen all at once, sorry. Pick-to: 6.5 Change-Id: If864d4d46075d00420f6e849cd68c4b824c1a50a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>