Commit ed91a6f49ce57fc8c1dad8059cfda90cbfd3cdac
1 parent
ca3277fb
Exists in
master
and in
3 other branches
Fixing WIN64 build.
Showing
2 changed files
with
6 additions
and
2 deletions
Show diff stats
src/ssl/crl.c
... | ... | @@ -28,10 +28,10 @@ |
28 | 28 | */ |
29 | 29 | |
30 | 30 | #include <config.h> |
31 | +#include <lib3270-internals.h> | |
31 | 32 | #include <lib3270.h> |
32 | 33 | #include <lib3270/log.h> |
33 | 34 | #include <trace_dsc.h> |
34 | -#include <lib3270-internals.h> | |
35 | 35 | #include <array.h> |
36 | 36 | |
37 | 37 | #ifdef HAVE_LIBSSL |
... | ... | @@ -120,7 +120,11 @@ int lib3270_get_crl_from_dist_points(H3270 *hSession, CRL_DIST_POINTS * dist_poi |
120 | 120 | ASN1_STRING *uri = GENERAL_NAME_get0_value(gen, >ype); |
121 | 121 | if(uri) |
122 | 122 | { |
123 | +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) // OpenSSL 1.1.0+ | |
123 | 124 | const unsigned char * data = ASN1_STRING_get0_data(uri); |
125 | +#else | |
126 | + const unsigned char * data = ASN1_STRING_data(uri); // ASN1_STRING_get0_data(uri); | |
127 | +#endif // OpenSSL 1.1.0+ | |
124 | 128 | if(data) |
125 | 129 | { |
126 | 130 | lib3270_string_array_append(uris,(char *) data); | ... | ... |
src/ssl/negotiate.c
... | ... | @@ -34,6 +34,7 @@ |
34 | 34 | |
35 | 35 | |
36 | 36 | #include <config.h> |
37 | +#include <lib3270-internals.h> | |
37 | 38 | |
38 | 39 | #if defined(HAVE_LIBSSL) |
39 | 40 | |
... | ... | @@ -49,7 +50,6 @@ |
49 | 50 | |
50 | 51 | #endif |
51 | 52 | |
52 | -#include <lib3270-internals.h> | |
53 | 53 | #include <errno.h> |
54 | 54 | #include <lib3270.h> |
55 | 55 | #include <lib3270/internals.h> | ... | ... |