Download as
Browse Code »

Commit 1612978cd171ca7315796c28f92588fa2ae6270b

Authored by Perry Werneck
1 parent 3b6fd918
Exists in master and in 3 other branches develop, macos, network_module

Updating windows code.

Showing 10 changed files with 23 additions and 36 deletions   Show diff stats
Makefile.in
  Diff comments   View file @1612978
... ... @@ -356,12 +356,6 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \
356 356 run: \
357 357 $(BINDBG)/$(LIBNAME)@EXEEXT@
358 358  
359   - @LD_LIBRARY_PATH=$(BINDBG) \
360   - $(BINDBG)/$(LIBNAME)@EXEEXT@
361   -
362   -mem-check: \
363   - $(BINDBG)/$(LIBNAME)@EXEEXT@
364   -
365 359 ifeq ($(VALGRIND),no)
366 360  
367 361 @LD_LIBRARY_PATH=$(BINDBG) \
... ...
configure.ac
  Diff comments   View file @1612978
... ... @@ -87,7 +87,7 @@ case "$host" in
87 87 app_win32_revision=$(date +%y.%m.%d.%H)
88 88 AC_SUBST(WIN32_VERSION,$app_win32_revision)
89 89  
90   - AC_CONFIG_FILES(src/lib3270/windows/resources.rc)
  90 + AC_CONFIG_FILES(src/core/windows/resources.rc)
91 91  
92 92 app_cv_static='yes'
93 93  
... ...
src/core/valgrind.suppression
View file @3b6fd91
... ... @@ -1,14 +0,0 @@
1   -{
2   - libcrypt_FIPS_selftest
3   - Memcheck:Cond
4   - ...
5   - fun:FIPS_selftest
6   -}
7   -
8   -{
9   - libcrypt_FIPS_mode_set
10   - Memcheck:Cond
11   - ...
12   - fun:FIPS_mode_set
13   -}
14   -
src/core/windows/connect.c
  Diff comments   View file @1612978
... ... @@ -37,7 +37,7 @@
37 37 #include <windows.h>
38 38 #include <ws2tcpip.h>
39 39  
40   -#include "../private.h"
  40 +#include <lib3270-internals.h>
41 41 #include <errno.h>
42 42 #include <lib3270/trace.h>
43 43 #include <lib3270/log.h>
... ...
src/core/windows/event_dispatcher.c
  Diff comments   View file @1612978
... ... @@ -32,7 +32,7 @@
32 32 *
33 33 */
34 34  
35   -#include "../private.h"
  35 +#include <lib3270-internals.h>
36 36 #include <sys/time.h>
37 37 #include <sys/types.h>
38 38 #include <lib3270/log.h>
... ...
src/core/windows/log.c
  Diff comments   View file @1612978
... ... @@ -32,7 +32,7 @@
32 32 #include <wtsapi32.h>
33 33 #include <lmcons.h>
34 34  
35   -#include "../private.h"
  35 +#include <lib3270-internals.h>
36 36 #include <stdio.h>
37 37 #include <stdarg.h>
38 38 #include <config.h>
... ...
src/core/windows/util.c
  Diff comments   View file @1612978
... ... @@ -34,7 +34,7 @@
34 34  
35 35 #include <winsock2.h>
36 36 #include <windows.h>
37   -#include "../private.h"
  37 +#include <lib3270-internals.h>
38 38  
39 39 #include "winversc.h"
40 40 #include <ws2tcpip.h>
... ...
src/ssl/negotiate.c
  Diff comments   View file @1612978
... ... @@ -36,6 +36,7 @@
36 36 #include <config.h>
37 37  
38 38 #if defined(HAVE_LIBSSL)
  39 +
39 40 #include <openssl/ssl.h>
40 41 #include <openssl/err.h>
41 42 #include <openssl/x509_vfy.h>
... ... @@ -100,8 +101,8 @@ static int background_ssl_init(H3270 *hSession, void *message)
100 101 if(hSession->ssl.con == NULL)
101 102 {
102 103 ((SSL_ERROR_MESSAGE *) message)->error = hSession->ssl.error = ERR_get_error();
103   - ((SSL_ERROR_MESSAGE *) message)->title = N_( "Security error" );
104   - ((SSL_ERROR_MESSAGE *) message)->text = N_( "Cant create a new SSL structure for current connection." );
  104 + ((SSL_ERROR_MESSAGE *) message)->title = _( "Security error" );
  105 + ((SSL_ERROR_MESSAGE *) message)->text = _( "Cant create a new SSL structure for current connection." );
105 106 return -1;
106 107 }
107 108  
... ... @@ -343,14 +344,6 @@ void ssl_info_callback(INFO_CONST SSL *s, int where, int ret)
343 344 {
344 345 H3270 *hSession = (H3270 *) SSL_get_ex_data(s,ssl_3270_ex_index);
345 346  
346   -#ifdef DEBUG
347   - if(hSession != lib3270_get_default_session_handle())
348   - {
349   - trace("%s: hsession=%p, session=%p",__FUNCTION__,hSession,lib3270_get_default_session_handle());
350   - exit(-1);
351   - }
352   -#endif // DEBUG
353   -
354 347 switch(where)
355 348 {
356 349 case SSL_CB_CONNECT_LOOP:
... ...
src/ssl/windows/getcrl.c
  Diff comments   View file @1612978
... ... @@ -52,7 +52,7 @@
52 52 #include <curl/curl.h>
53 53 #endif // HAVE_LIBCURL
54 54  
55   -#include "../../private.h"
  55 +#include <lib3270-internals.h>
56 56 #include <trace_dsc.h>
57 57 #include <errno.h>
58 58 #include <lib3270.h>
... ...
valgrind.suppression 0 → 100644
  Diff comments   View file @1612978
... ... @@ -0,0 +1,14 @@
  1 +{
  2 + libcrypt_FIPS_selftest
  3 + Memcheck:Cond
  4 + ...
  5 + fun:FIPS_selftest
  6 +}
  7 +
  8 +{
  9 + libcrypt_FIPS_mode_set
  10 + Memcheck:Cond
  11 + ...
  12 + fun:FIPS_mode_set
  13 +}
  14 +
... ...