various fixes and simplifications wrt openssl.h