]> jfr.im git - solanum.git/commitdiff
OpenSSL: Initialise if LibreSSL
authorAaron Jones <redacted>
Thu, 1 Sep 2016 19:29:47 +0000 (19:29 +0000)
committerAaron Jones <redacted>
Thu, 1 Sep 2016 19:29:47 +0000 (19:29 +0000)
LibreSSL's definition of OPENSSL_VERSION_NUMBER bites us in the ass,
*again*.

librb/src/openssl.c

index 1f3a54e18d18ae4fdce3472fc2b7bbc5248d1d50..62f731adc7d0cdcea13f3da328d342636bfaad45 100644 (file)
@@ -357,13 +357,13 @@ rb_init_ssl(void)
 {
        char librb_data[] = "librb data";
 
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
        /*
         * OpenSSL 1.1.0 and above automatically initialises itself with sane defaults
         */
+       #if defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x10100000L)
        SSL_library_init();
        SSL_load_error_strings();
-#endif
+       #endif
 
        librb_index = SSL_get_ex_new_index(0, librb_data, NULL, NULL, NULL);