This is just a preparation for more OpenSSL refactoring.
This will create a new commit in order to revert the existing changes.
