Commit 984b5f402ceefca77696f95bd78c3e05d4d117a5

Authored by Perry Werneck
2 parents e3ac1894 1820bcc5
Exists in master and in 2 other branches develop, macos

Merge branch 'develop' into network_module

src/core/properties/boolean.c
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@
39 #include <lib3270/properties.h> 39 #include <lib3270/properties.h>
40 #include <lib3270/keyboard.h> 40 #include <lib3270/keyboard.h>
41 #include <lib3270/selection.h> 41 #include <lib3270/selection.h>
  42 + #include <lib3270/ssl.h>
42 43
43 int lib3270_is_starting(const H3270 *hSession) 44 int lib3270_is_starting(const H3270 *hSession)
44 { 45 {
src/include/lib3270/properties.h
@@ -213,21 +213,6 @@ @@ -213,21 +213,6 @@
213 LIB3270_EXPORT const LIB3270_UINT_PROPERTY * lib3270_unsigned_property_get_by_name(const char *name); 213 LIB3270_EXPORT const LIB3270_UINT_PROPERTY * lib3270_unsigned_property_get_by_name(const char *name);
214 214
215 /** 215 /**
216 - * @brief Disable automatic download of the CRL.  
217 - *  
218 - * @param hSession Session handle.  
219 - * @param Value Non zero to enable automatic download of CRL.  
220 - *  
221 - * @return 0 if ok or error code if not (Sets errno).  
222 - *  
223 - * @retval 0 Success, the property was set.  
224 - * @retval ENOTSUP No SSL/TLS support.  
225 - */  
226 - LIB3270_EXPORT int lib3270_ssl_set_crl_download(H3270 *hSession, int enabled);  
227 -  
228 - LIB3270_EXPORT int lib3270_ssl_get_crl_download(const H3270 *hSession);  
229 -  
230 - /**  
231 * @brief Get lib3270 version info. 216 * @brief Get lib3270 version info.
232 * 217 *
233 * @return String with lib3270 version info (release it with lib3270_free). 218 * @return String with lib3270 version info (release it with lib3270_free).
src/include/lib3270/ssl.h
@@ -107,6 +107,22 @@ @@ -107,6 +107,22 @@
107 LIB3270_EXPORT char * lib3270_get_ssl_crl_text(const H3270 *hSession); 107 LIB3270_EXPORT char * lib3270_get_ssl_crl_text(const H3270 *hSession);
108 LIB3270_EXPORT char * lib3270_get_ssl_peer_certificate_text(const H3270 *hSession); 108 LIB3270_EXPORT char * lib3270_get_ssl_peer_certificate_text(const H3270 *hSession);
109 109
  110 + /**
  111 + * @brief Disable automatic download of the CRL.
  112 + *
  113 + * @param hSession Session handle.
  114 + * @param Value Non zero to enable automatic download of CRL.
  115 + *
  116 + * @return 0 if ok or error code if not (Sets errno).
  117 + *
  118 + * @retval 0 Success, the property was set.
  119 + * @retval ENOTSUP No SSL/TLS support.
  120 + */
  121 + LIB3270_EXPORT int lib3270_ssl_set_crl_download(H3270 *hSession, int enabled);
  122 +
  123 + LIB3270_EXPORT int lib3270_ssl_get_crl_download(const H3270 *hSession);
  124 +
  125 +
110 #ifdef __cplusplus 126 #ifdef __cplusplus
111 } 127 }
112 #endif 128 #endif