Fix session id len

Manual merge of c7a29290a788b3d1

diff --git a/src/include/tls.h b/src/include/tls.h
index d68599a..20e4422 100644 (file)
--- a/src/include/tls.h
+++ b/src/include/tls.h
@@ -360,7 +360,7 @@ struct fr_tls_server_conf_t {
         int            session_timeout;
         int            session_cache_size;
        char            *session_id_name;
-       char            session_context_id[128];
+       char            session_context_id[SSL_MAX_SSL_SESSION_ID_LENGTH];
        time_t          session_last_flushed;
 
        char            *verify_tmp_dir;

diff --git a/src/main/tls.c b/src/main/tls.c
index 75faa2a..37d3618 100644 (file)
--- a/src/main/tls.c
+++ b/src/main/tls.c
@@ -1817,12 +1817,12 @@ load_ca:
                if (conf->session_id_name) {
                        snprintf(conf->session_context_id,
                                 sizeof(conf->session_context_id),
-                                "FreeRADIUS EAP-TLS %s",
+                                "FR eap %s",
                                 conf->session_id_name);
                } else {
                        snprintf(conf->session_context_id,
                                 sizeof(conf->session_context_id),
-                                "FreeRADIUS EAP-TLS %p", conf);
+                                "FR eap %p", conf);
                }
 
                /*