Back up some changes to openssl*

51ebb148 made some changes to openssl.rb and openssl-windows.rb that we
haven't pulled in all the rigging for yet. Try to work around that.