Commit dfd84b6346d1d84134b8e5d4d864a13abf9d0023
1 parent
5ddaf550
Exists in
master
and in
3 other branches
Fixing windows build.
Showing
3 changed files
with
2 additions
and
8 deletions
Show diff stats
src/ssl/linux/getcrl.c
@@ -45,7 +45,7 @@ static inline void lib3270_autoptr_cleanup_FILE(FILE **file) | @@ -45,7 +45,7 @@ static inline void lib3270_autoptr_cleanup_FILE(FILE **file) | ||
45 | fclose(*file); | 45 | fclose(*file); |
46 | } | 46 | } |
47 | 47 | ||
48 | -LIB3270_INTERNAL X509_CRL * lib3270_download_crl(H3270 *hSession, SSL_ERROR_MESSAGE * message, const char *consturl) | 48 | +X509_CRL * lib3270_download_crl(H3270 *hSession, SSL_ERROR_MESSAGE * message, const char *consturl) |
49 | { | 49 | { |
50 | X509_CRL * x509_crl = NULL; | 50 | X509_CRL * x509_crl = NULL; |
51 | 51 |
src/ssl/negotiate.c
@@ -282,12 +282,10 @@ static int background_ssl_negotiation(H3270 *hSession, void *message) | @@ -282,12 +282,10 @@ static int background_ssl_negotiation(H3270 *hSession, void *message) | ||
282 | trace_ssl(hSession,"Unexpected or invalid TLS/SSL verify result %d\n",rv); | 282 | trace_ssl(hSession,"Unexpected or invalid TLS/SSL verify result %d\n",rv); |
283 | set_ssl_state(hSession,LIB3270_SSL_UNSECURE); | 283 | set_ssl_state(hSession,LIB3270_SSL_UNSECURE); |
284 | 284 | ||
285 | -#ifdef SSL_ENABLE_CRL_EXPIRATION_CHECK | ||
286 | ((SSL_ERROR_MESSAGE *) message)->title = _( "Security error" ); | 285 | ((SSL_ERROR_MESSAGE *) message)->title = _( "Security error" ); |
287 | ((SSL_ERROR_MESSAGE *) message)->text = _( "Can't verify." ); | 286 | ((SSL_ERROR_MESSAGE *) message)->text = _( "Can't verify." ); |
288 | ((SSL_ERROR_MESSAGE *) message)->description = _( "Unexpected or invalid TLS/SSL verify result" ); | 287 | ((SSL_ERROR_MESSAGE *) message)->description = _( "Unexpected or invalid TLS/SSL verify result" ); |
289 | return EACCES; | 288 | return EACCES; |
290 | -#endif // SSL_ENABLE_CRL_EXPIRATION_CHECK | ||
291 | 289 | ||
292 | } | 290 | } |
293 | else | 291 | else |
src/ssl/windows/getcrl.c
@@ -39,10 +39,6 @@ | @@ -39,10 +39,6 @@ | ||
39 | 39 | ||
40 | #include "private.h" | 40 | #include "private.h" |
41 | 41 | ||
42 | -#define CRL_DATA_LENGTH 2048 | ||
43 | - | ||
44 | -// #include <winldap.h> | ||
45 | - | ||
46 | /*--[ Implement ]------------------------------------------------------------------------------------*/ | 42 | /*--[ Implement ]------------------------------------------------------------------------------------*/ |
47 | 43 | ||
48 | static inline void lib3270_autoptr_cleanup_FILE(FILE **file) | 44 | static inline void lib3270_autoptr_cleanup_FILE(FILE **file) |
@@ -51,7 +47,7 @@ static inline void lib3270_autoptr_cleanup_FILE(FILE **file) | @@ -51,7 +47,7 @@ static inline void lib3270_autoptr_cleanup_FILE(FILE **file) | ||
51 | fclose(*file); | 47 | fclose(*file); |
52 | } | 48 | } |
53 | 49 | ||
54 | -LIB3270_INTERNAL X509_CRL * lib3270_get_crl(H3270 *hSession, SSL_ERROR_MESSAGE * message, const char *consturl) | 50 | +X509_CRL * lib3270_download_crl(H3270 *hSession, SSL_ERROR_MESSAGE * message, const char *consturl) |
55 | { | 51 | { |
56 | X509_CRL * x509_crl = NULL; | 52 | X509_CRL * x509_crl = NULL; |
57 | 53 |