From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 4 Feb 2022 00:08:59 +0000 (-0500)
Subject: Fix OpenSSL version printing
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aa7fa2ff2de8e17b5fb6bea99795979530a7441;p=thirdparty%2Ffreeradius-server.git

Fix OpenSSL version printing
---

diff --git a/src/lib/tls/cache.c b/src/lib/tls/cache.c
index f8cd8873090..a3319a0346f 100644
--- a/src/lib/tls/cache.c
+++ b/src/lib/tls/cache.c
@@ -724,7 +724,7 @@ static int tls_cache_store_cb(SSL *ssl, SSL_SESSION *sess)
 	if (unlang_request_is_cancelled(request)) return 0;
 
 	id = SSL_SESSION_get_id(sess, &id_len);
-	RDEBUG3("Requested session store - ID %pV", fr_box_octets(id, id_len));
+	RDEBUG3("Session ID %pV - Requested store", fr_box_octets(id, id_len));
 	/*
 	 *	Store the session blob and session id for writing
 	 *	later, once all the authentication phases have completed.
diff --git a/src/lib/tls/version.c b/src/lib/tls/version.c
index 45c67d1de8c..c7b3d723acc 100644
--- a/src/lib/tls/version.c
+++ b/src/lib/tls/version.c
@@ -92,7 +92,7 @@ char const *fr_openssl_version_str_from_num(uint32_t v)
 	 *	If OpenSSL major version is less than three
 	 *	use the old version number layout.
 	 */
-	if ((v & 0xf0000000) < 3) {
+	if (((v & 0xf0000000) >> 28) < 3) {
 		p += sprintf(p, "%u.%u.%u",
 			     (0xf0000000 & v) >> 28,
 			     (0x0ff00000 & v) >> 20,