resolve conflicts

1 files changed, 8 insertions, 0 deletions

diff --git a/src/lib/libssl/ssl_txt.c b/src/lib/libssl/ssl_txt.c
index 3122440e26..6479d52c0c 100644
--- a/src/lib/libssl/ssl_txt.c
+++ b/src/lib/libssl/ssl_txt.c
@@ -115,6 +115,10 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
                 s="SSLv2";
         else if (x->ssl_version == SSL3_VERSION)
                 s="SSLv3";
+        else if (x->ssl_version == TLS1_2_VERSION)
+                s="TLSv1.2";
+        else if (x->ssl_version == TLS1_1_VERSION)
+                s="TLSv1.1";
         else if (x->ssl_version == TLS1_VERSION)
                 s="TLSv1";
         else if (x->ssl_version == DTLS1_VERSION)
@@ -187,6 +191,10 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
         if (BIO_puts(bp,"\n    PSK identity hint: ") <= 0) goto err;
         if (BIO_printf(bp, "%s", x->psk_identity_hint ? x->psk_identity_hint : "None") <= 0) goto err;
 #endif
+#ifndef OPENSSL_NO_SRP
+        if (BIO_puts(bp,"\n    SRP username: ") <= 0) goto err;
+        if (BIO_printf(bp, "%s", x->srp_username ? x->srp_username : "None") <= 0) goto err;
+#endif
 #ifndef OPENSSL_NO_TLSEXT
         if (x->tlsext_tick_lifetime_hint)
                 {