diff --git a/po/pt_BR.po b/po/pt_BR.po index 8319be7..ee69a78 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-25 10:47-0300\n" +"POT-Creation-Date: 2013-04-01 11:10-0300\n" "PO-Revision-Date: 2013-04-01 10:06-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português <>\n" @@ -91,11 +91,11 @@ msgstr "- Emulador 3270 para GTK" msgid "16 colors" msgstr "16 cores" -#: screen.c:655 screen.c:685 screen.c:699 screen.c:818 +#: screen.c:691 screen.c:721 screen.c:735 screen.c:854 msgid "3270 Error" msgstr "Erro 3270" -#: screen.c:670 +#: screen.c:706 msgid "3270 Warning" msgstr "Alerta 3270" @@ -1655,7 +1655,7 @@ msgstr "Tipo de servidor:" msgid "TELNET Proxy: send error" msgstr "TELNET Proxy: Erro ao enviar" -#: telnet.c:3227 +#: telnet.c:3253 msgid "TLS negotiation failure" msgstr "Negociação TLS falhou" diff --git a/pw3270.nsi.in b/pw3270.nsi.in index e81745b..42035c8 100644 --- a/pw3270.nsi.in +++ b/pw3270.nsi.in @@ -73,6 +73,10 @@ SubSection "@PACKAGE@" SecMain file "/oname=$INSTDIR\AUTHORS" "AUTHORS" file "/oname=$INSTDIR\LICENSE" "LICENSE" + # Misc folders + CreateDirectory "$INSTDIR\certs" + CreateDirectory "$INSTDIR\plugins" + # UI definition files CreateDirectory "$INSTDIR\ui" diff --git a/src/lib3270/telnet.c b/src/lib3270/telnet.c index c06f46a..cbfd520 100644 --- a/src/lib3270/telnet.c +++ b/src/lib3270/telnet.c @@ -3101,8 +3101,34 @@ static void ssl_init(H3270 *session) SSL_CTX_set_info_callback(ssl_ctx, ssl_info_callback); SSL_CTX_set_default_verify_paths(ssl_ctx); +#if defined(_WIN32) + { + HKEY hKey = 0; + + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,"Software\\" PACKAGE_NAME,0,KEY_QUERY_VALUE,&hKey) == ERROR_SUCCESS) + { + char data[4096]; + unsigned long datalen = sizeof(data); // data field length(in), data returned length(out) + unsigned long datatype; // #defined in winnt.h (predefined types 0-11) + + if(RegQueryValueExA(hKey,"datadir",NULL,&datatype,(LPBYTE) data,&datalen) == ERROR_SUCCESS) + { + strncat(data,"\\certs",4095); + + trace("Loading certs from \"%s\"",data); + SSL_CTX_load_verify_locations(ssl_ctx,NULL,data); + } + RegCloseKey(hKey); + } + + + } + +#endif // _WIN32 + ssl_3270_ex_index = SSL_get_ex_new_index(0,NULL,NULL,NULL,NULL); + } if(session->ssl_con) -- libgit2 0.21.2