Commit 1fba4244ae65f05b45f376fec97fdf03c9b50724
1 parent
b3689aa0
Exists in
master
and in
5 other branches
Incluindo diretório para certificados CA no windows
Showing
3 changed files
with
34 additions
and
4 deletions
Show diff stats
po/pt_BR.po
| @@ -5,7 +5,7 @@ msgid "" | @@ -5,7 +5,7 @@ msgid "" | ||
| 5 | msgstr "" | 5 | msgstr "" |
| 6 | "Project-Id-Version: pw3270 5.0\n" | 6 | "Project-Id-Version: pw3270 5.0\n" |
| 7 | "Report-Msgid-Bugs-To: \n" | 7 | "Report-Msgid-Bugs-To: \n" |
| 8 | -"POT-Creation-Date: 2013-03-25 10:47-0300\n" | 8 | +"POT-Creation-Date: 2013-04-01 11:10-0300\n" |
| 9 | "PO-Revision-Date: 2013-04-01 10:06-0300\n" | 9 | "PO-Revision-Date: 2013-04-01 10:06-0300\n" |
| 10 | "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" | 10 | "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" |
| 11 | "Language-Team: Português <>\n" | 11 | "Language-Team: Português <>\n" |
| @@ -91,11 +91,11 @@ msgstr "- Emulador 3270 para GTK" | @@ -91,11 +91,11 @@ msgstr "- Emulador 3270 para GTK" | ||
| 91 | msgid "16 colors" | 91 | msgid "16 colors" |
| 92 | msgstr "16 cores" | 92 | msgstr "16 cores" |
| 93 | 93 | ||
| 94 | -#: screen.c:655 screen.c:685 screen.c:699 screen.c:818 | 94 | +#: screen.c:691 screen.c:721 screen.c:735 screen.c:854 |
| 95 | msgid "3270 Error" | 95 | msgid "3270 Error" |
| 96 | msgstr "Erro 3270" | 96 | msgstr "Erro 3270" |
| 97 | 97 | ||
| 98 | -#: screen.c:670 | 98 | +#: screen.c:706 |
| 99 | msgid "3270 Warning" | 99 | msgid "3270 Warning" |
| 100 | msgstr "Alerta 3270" | 100 | msgstr "Alerta 3270" |
| 101 | 101 | ||
| @@ -1655,7 +1655,7 @@ msgstr "Tipo de servidor:" | @@ -1655,7 +1655,7 @@ msgstr "Tipo de servidor:" | ||
| 1655 | msgid "TELNET Proxy: send error" | 1655 | msgid "TELNET Proxy: send error" |
| 1656 | msgstr "TELNET Proxy: Erro ao enviar" | 1656 | msgstr "TELNET Proxy: Erro ao enviar" |
| 1657 | 1657 | ||
| 1658 | -#: telnet.c:3227 | 1658 | +#: telnet.c:3253 |
| 1659 | msgid "TLS negotiation failure" | 1659 | msgid "TLS negotiation failure" |
| 1660 | msgstr "Negociação TLS falhou" | 1660 | msgstr "Negociação TLS falhou" |
| 1661 | 1661 |
pw3270.nsi.in
| @@ -73,6 +73,10 @@ SubSection "@PACKAGE@" SecMain | @@ -73,6 +73,10 @@ SubSection "@PACKAGE@" SecMain | ||
| 73 | file "/oname=$INSTDIR\AUTHORS" "AUTHORS" | 73 | file "/oname=$INSTDIR\AUTHORS" "AUTHORS" |
| 74 | file "/oname=$INSTDIR\LICENSE" "LICENSE" | 74 | file "/oname=$INSTDIR\LICENSE" "LICENSE" |
| 75 | 75 | ||
| 76 | + # Misc folders | ||
| 77 | + CreateDirectory "$INSTDIR\certs" | ||
| 78 | + CreateDirectory "$INSTDIR\plugins" | ||
| 79 | + | ||
| 76 | # UI definition files | 80 | # UI definition files |
| 77 | CreateDirectory "$INSTDIR\ui" | 81 | CreateDirectory "$INSTDIR\ui" |
| 78 | 82 |
src/lib3270/telnet.c
| @@ -3101,8 +3101,34 @@ static void ssl_init(H3270 *session) | @@ -3101,8 +3101,34 @@ static void ssl_init(H3270 *session) | ||
| 3101 | SSL_CTX_set_info_callback(ssl_ctx, ssl_info_callback); | 3101 | SSL_CTX_set_info_callback(ssl_ctx, ssl_info_callback); |
| 3102 | SSL_CTX_set_default_verify_paths(ssl_ctx); | 3102 | SSL_CTX_set_default_verify_paths(ssl_ctx); |
| 3103 | 3103 | ||
| 3104 | +#if defined(_WIN32) | ||
| 3105 | + { | ||
| 3106 | + HKEY hKey = 0; | ||
| 3107 | + | ||
| 3108 | + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,"Software\\" PACKAGE_NAME,0,KEY_QUERY_VALUE,&hKey) == ERROR_SUCCESS) | ||
| 3109 | + { | ||
| 3110 | + char data[4096]; | ||
| 3111 | + unsigned long datalen = sizeof(data); // data field length(in), data returned length(out) | ||
| 3112 | + unsigned long datatype; // #defined in winnt.h (predefined types 0-11) | ||
| 3113 | + | ||
| 3114 | + if(RegQueryValueExA(hKey,"datadir",NULL,&datatype,(LPBYTE) data,&datalen) == ERROR_SUCCESS) | ||
| 3115 | + { | ||
| 3116 | + strncat(data,"\\certs",4095); | ||
| 3117 | + | ||
| 3118 | + trace("Loading certs from \"%s\"",data); | ||
| 3119 | + SSL_CTX_load_verify_locations(ssl_ctx,NULL,data); | ||
| 3120 | + } | ||
| 3121 | + RegCloseKey(hKey); | ||
| 3122 | + } | ||
| 3123 | + | ||
| 3124 | + | ||
| 3125 | + } | ||
| 3126 | + | ||
| 3127 | +#endif // _WIN32 | ||
| 3128 | + | ||
| 3104 | ssl_3270_ex_index = SSL_get_ex_new_index(0,NULL,NULL,NULL,NULL); | 3129 | ssl_3270_ex_index = SSL_get_ex_new_index(0,NULL,NULL,NULL,NULL); |
| 3105 | 3130 | ||
| 3131 | + | ||
| 3106 | } | 3132 | } |
| 3107 | 3133 | ||
| 3108 | if(session->ssl_con) | 3134 | if(session->ssl_con) |