diff options
| -rw-r--r-- | protocols/IRCG/res/IRC.rc | 4 | ||||
| -rw-r--r-- | src/mir_app/src/netlib_ssl.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/protocols/IRCG/res/IRC.rc b/protocols/IRCG/res/IRC.rc index 05cf1989d2..27dec7e55f 100644 --- a/protocols/IRCG/res/IRC.rc +++ b/protocols/IRCG/res/IRC.rc @@ -74,7 +74,7 @@ BEGIN EDITTEXT IDC_PORT,8,47,39,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
LTEXT "->",IDC_STATIC,55,49,8,8
EDITTEXT IDC_PORT2,68,47,39,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
- LTEXT "SSL",IDC_STATIC,8,64,28,8,0,WS_EX_TRANSPARENT
+ LTEXT "SSL/TLS",IDC_STATIC,8,64,28,8,0,WS_EX_TRANSPARENT
COMBOBOX IDC_SSL,8,74,48,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
CONTROL "Enable SASL",IDC_SASL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,92,127,10
LTEXT "Password",IDC_STATIC,8,105,127,8,0,WS_EX_TRANSPARENT
@@ -396,7 +396,7 @@ BEGIN LTEXT "Host",IDC_STATIC,5,8,79,8
LTEXT "Port range",IDC_STATIC,5,22,79,8
LTEXT "->",IDC_STATIC,130,24,10,8
- LTEXT "SSL",IDC_STATIC,5,39,79,8
+ LTEXT "SSL/TLS",IDC_STATIC,5,39,79,8
COMBOBOX IDC_SSL,87,37,48,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
END
diff --git a/src/mir_app/src/netlib_ssl.cpp b/src/mir_app/src/netlib_ssl.cpp index 9946658bde..1f8ffe5f2c 100644 --- a/src/mir_app/src/netlib_ssl.cpp +++ b/src/mir_app/src/netlib_ssl.cpp @@ -360,13 +360,13 @@ MIR_APP_DLL(int) Netlib_StartSsl(HNETLIBCONN hConnection, const char *szHost) szHost = nlc->nloc.szHost; szHost = NEWSTR_ALLOCA(szHost); - Netlib_Logf(nlu, "(%d %s) Starting SSL negotiation", int(nlc->s), szHost); + Netlib_Logf(nlu, "(%d %s) Starting SSL/TLS negotiation", int(nlc->s), szHost); nlc->hSsl = Netlib_SslConnect(nlc->s, szHost, nlu->settings.validateSSL); if (nlc->hSsl == nullptr) - Netlib_Logf(nlu, "(%d %s) Failure to negotiate SSL connection", int(nlc->s), szHost); + Netlib_Logf(nlu, "(%d %s) Failure to negotiate SSL/TLS connection", int(nlc->s), szHost); else - Netlib_Logf(nlu, "(%d %s) SSL negotiation successful", int(nlc->s), szHost); + Netlib_Logf(nlu, "(%d %s) SSL/TLS negotiation successful", int(nlc->s), szHost); return nlc->hSsl != nullptr; } |