Fix OpenSSL version printing

diff --git a/src/lib/tls/cache.c b/src/lib/tls/cache.c
index f8cd8873090fc8c2eedbd870a0452679a11ce779..a3319a0346f5a8c7449045c07c2c9a5851c1b81e 100644 (file)
--- 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 45c67d1de8cc3fab3654239a3ccae8234ebc5aca..c7b3d723acccea17b6ac52c7c4103ab024984042 100644 (file)
--- 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,