Download as
Browse Code »

Commit 297d0c9ced5c80850f9bf5289194742bcc2ddacc

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

Cleaning up.

Showing 5 changed files with 7 additions and 24 deletions   Show diff stats
src/core/host.c
  Diff comments   View file @297d0c9
@@ -228,10 +228,7 @@ void lib3270_set_disconnected(H3270 *hSession) @@ -228,10 +228,7 @@ void lib3270_set_disconnected(H3270 *hSession)
228 228
229 hSession->kybdlock = LIB3270_KL_NOT_CONNECTED; 229 hSession->kybdlock = LIB3270_KL_NOT_CONNECTED;
230 hSession->starting = 0; 230 hSession->starting = 0;
231 -  
232 -#if defined(HAVE_LIBSSL)  
233 hSession->ssl.state = LIB3270_SSL_UNDEFINED; 231 hSession->ssl.state = LIB3270_SSL_UNDEFINED;
234 -#endif // HAVE_LIBSSL  
235 232
236 set_status(hSession,LIB3270_FLAG_UNDERA,False); 233 set_status(hSession,LIB3270_FLAG_UNDERA,False);
237 234
@@ -242,9 +239,7 @@ void lib3270_set_disconnected(H3270 *hSession) @@ -242,9 +239,7 @@ void lib3270_set_disconnected(H3270 *hSession)
242 if(hSession->cbk.update_connect) 239 if(hSession->cbk.update_connect)
243 hSession->cbk.update_connect(hSession,0); 240 hSession->cbk.update_connect(hSession,0);
244 241
245 -#if defined(HAVE_LIBSSL)  
246 hSession->cbk.update_ssl(hSession,hSession->ssl.state); 242 hSession->cbk.update_ssl(hSession,hSession->ssl.state);
247 -#endif // HAVE_LIBSSL  
248 243
249 } 244 }
250 245
src/core/linux/ldap.c
  Diff comments   View file @297d0c9
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 29
30 #include <config.h> 30 #include <config.h>
31 31
32 -#if defined(HAVE_LDAP) && defined HAVE_LIBSSL 32 +#if defined(HAVE_LDAP) && defined(HAVE_LIBSSL)
33 33
34 #include <internals.h> 34 #include <internals.h>
35 #include <lib3270.h> 35 #include <lib3270.h>
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 43
44 typedef char LDAPPTR; 44 typedef char LDAPPTR;
45 45
46 -/*--[ Implement ]------------------------------------------------------------------------------------*/ 46 +//--[ Implement ]------------------------------------------------------------------------------------
47 47
48 static inline void lib3270_autoptr_cleanup_LDAPMessage(LDAPMessage **message) 48 static inline void lib3270_autoptr_cleanup_LDAPMessage(LDAPMessage **message)
49 { 49 {
src/core/windows/ldap.c
  Diff comments   View file @297d0c9
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 36
37 #include <config.h> 37 #include <config.h>
38 38
39 -#if defined(HAVE_LIBSSL) && defined(SSL_ENABLE_CRL_CHECK) && defined(HAVE_LDAP) 39 +#if defined(HAVE_LDAP) && defined(HAVE_LIBSSL)
40 40
41 #include "private.h" 41 #include "private.h"
42 #include <winldap.h> 42 #include <winldap.h>
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 # include <winber.h> 51 # include <winber.h>
52 # endif 52 # endif
53 53
54 -/*--[ Implement ]------------------------------------------------------------------------------------*/ 54 +//--[ Implement ]------------------------------------------------------------------------------------
55 55
56 static inline void lib3270_autoptr_cleanup_LDAP(LDAP **ptr) 56 static inline void lib3270_autoptr_cleanup_LDAP(LDAP **ptr)
57 { 57 {
@@ -229,4 +229,4 @@ X509_CRL * lib3270_crl_get_using_ldap(H3270 *hSession, const char *consturl, con @@ -229,4 +229,4 @@ X509_CRL * lib3270_crl_get_using_ldap(H3270 *hSession, const char *consturl, con
229 229
230 } 230 }
231 231
232 -#endif // defined(HAVE_LIBSSL) && defined(SSL_ENABLE_CRL_CHECK) && defined(HAVE_LDAP) 232 +#endif // defined(HAVE_LIBSSL) && defined(HAVE_LDAP)
src/include/internals.h
  Diff comments   View file @297d0c9
@@ -42,12 +42,6 @@ @@ -42,12 +42,6 @@
42 #include <networking.h> 42 #include <networking.h>
43 #include <lib3270/os.h> 43 #include <lib3270/os.h>
44 44
45 -#if defined(HAVE_LIBSSL)  
46 - #include <openssl/ssl.h>  
47 - #include <openssl/x509v3.h>  
48 -  
49 -#endif // HAVE_LIBSSL  
50 -  
51 #if defined(X3270_TN3270E) && !defined(X3270_ANSI) /*[*/ 45 #if defined(X3270_TN3270E) && !defined(X3270_ANSI) /*[*/
52 #define X3270_ANSI 1 /* RFC2355 requires NVT mode */ 46 #define X3270_ANSI 1 /* RFC2355 requires NVT mode */
53 #endif /*]*/ 47 #endif /*]*/
@@ -56,14 +50,7 @@ @@ -56,14 +50,7 @@
56 #define _GNU_SOURCE /* vasprintf isn't POSIX */ 50 #define _GNU_SOURCE /* vasprintf isn't POSIX */
57 #endif /*]*/ 51 #endif /*]*/
58 52
59 -/*  
60 - * gettext stuff  
61 - */  
62 -#ifdef ANDROID  
63 - #undef HAVE_LIBINTL  
64 - #undef HAVE_LIBSSL  
65 -#endif  
66 - 53 +// gettext stuff
67 #ifdef HAVE_LIBINTL 54 #ifdef HAVE_LIBINTL
68 #include <locale.h> 55 #include <locale.h>
69 #include <libintl.h> 56 #include <libintl.h>
src/network_modules/openssl/private.h
  Diff comments   View file @297d0c9
@@ -51,6 +51,7 @@ @@ -51,6 +51,7 @@
51 51
52 #include <openssl/ssl.h> 52 #include <openssl/ssl.h>
53 #include <openssl/x509.h> 53 #include <openssl/x509.h>
  54 + #include <openssl/x509v3.h>
54 #include <openssl/err.h> 55 #include <openssl/err.h>
55 56
56 struct _lib3270_network_popup { 57 struct _lib3270_network_popup {