Use OPENSSL_VERSION_NUMBER over OPENSSL_VERSION_MAJOR (for compatibility)

Since OpenSSL 3.0 there is new OPENSSL_VERSION_MAJOR, but previous
releases does not have it.

So let's use plain old OPENSSL_VERSION_NUMBER to avoid more preprocessor
macros.

diff --git a/sample/becat.c b/sample/becat.c
index c6daf90a2738de1261743395aec1ec7a23fb9b66..501690da6cdb7ad082d76228a2ed6d7d4b19e4be 100644 (file)
--- a/sample/becat.c
+++ b/sample/becat.c
@@ -188,7 +188,7 @@ static void ssl_ctx_free(struct ssl_context *ssl)
 static int ssl_load_key(struct ssl_context *ssl)
 {
        int err = 1;
-#if OPENSSL_VERSION_MAJOR >= 3
+#if OPENSSL_VERSION_NUMBER >= 0x30000000
        ssl->pkey = EVP_RSA_gen(4096);
        err = ssl->pkey == NULL;
 #else
@@ -391,7 +391,7 @@ static void be_ssl_errors(struct bufferevent *bev)
        while ((err = bufferevent_get_openssl_error(bev))) {
                const char *msg = ERR_reason_error_string(err);
                const char *lib = ERR_lib_error_string(err);
-#if OPENSSL_VERSION_MAJOR >= 3
+#if OPENSSL_VERSION_NUMBER >= 0x30000000
                error("ssl/err=%d/%s in %s\n", err, msg, lib);
 #else
                const char *func = ERR_func_error_string(err);

diff --git a/sample/le-proxy.c b/sample/le-proxy.c
index 881d3a5935ef109f5ca247181d1abe9ff2b821c2..1aa7d648afd772519f16492f35a8fad6be3336e7 100644 (file)
--- a/sample/le-proxy.c
+++ b/sample/le-proxy.c
@@ -113,7 +113,7 @@ eventcb(struct bufferevent *bev, short what, void *ctx)
                                    ERR_reason_error_string(err);
                                const char *lib = (const char*)
                                    ERR_lib_error_string(err);
-#if OPENSSL_VERSION_MAJOR >= 3
+#if OPENSSL_VERSION_NUMBER >= 0x30000000
                                fprintf(stderr,
                                        "%s in %s\n", msg, lib);
 #else

diff --git a/test/regress_ssl.c b/test/regress_ssl.c
index a27f225a913aefb88938e05b1a9226ac4323317c..55ea7e61ade42f14dadfbc00c8fdb4dce25f2374 100644 (file)
--- a/test/regress_ssl.c
+++ b/test/regress_ssl.c
@@ -224,7 +224,7 @@ eventcb(struct bufferevent *bev, short what, void *ctx)
                ++n_connected;
                ssl = bufferevent_ssl_get_ssl(bev);
                tt_assert(ssl);
-#if OPENSSL_VERSION_MAJOR >= 3
+#if OPENSSL_VERSION_NUMBER >= 0x30000000
                /* SSL_get1_peer_certificate() means we want
                 * to increase the reference count on the cert
                 * and so we will need to free it ourselves later