Download as
Browse Code »

Commit 7a2691061a2cd9ff8730c5406a10647d431ba409

Authored by Perry Werneck
2 parents adab7142 f49c915e
Exists in master and in 1 other branch develop

Merge branch 'fips' into develop

Showing 3 changed files with 9 additions and 2 deletions   Show diff stats
rpm/_service
  Diff comments   View file @7a26910
... ... @@ -31,11 +31,11 @@
31 31 <param name="files">*/debian/*.dsc</param>
32 32 </service>
33 33  
34   - <service name="extract_file">
  34 + <!-- service name="extract_file">
35 35 <param name="archive">*.tar</param>
36 36 <param name="files">*/debian/control</param>
37 37 <param name="outfilename">debian.control</param>
38   - </service>
  38 + </service -->
39 39  
40 40 <!-- service name="extract_file">
41 41 <param name="archive">*.tar</param>
... ...
src/network_modules/openssl/context.c
  Diff comments   View file @7a26910
... ... @@ -184,6 +184,9 @@ SSL_CTX * lib3270_openssl_get_context(H3270 *hSession) {
184 184 if(rc == ERROR_SUCCESS) {
185 185 DWORD mode = lib3270_win32_get_dword(hKey, "fips_mode", FIPS_mode());
186 186 if(FIPS_mode_set(mode) != 1) {
  187 +
  188 + SSL_load_error_strings();
  189 +
187 190 char err_buff[1024];
188 191 memset(err_buff,0,sizeof(err_buff));
189 192 (void) ERR_error_string_n(ERR_get_error(), err_buff, 1023);
... ...
src/testprogram/testprogram.c
  Diff comments   View file @7a26910
... ... @@ -43,6 +43,10 @@
43 43 #include <lib3270/charset.h>
44 44 #include <stdio.h>
45 45  
  46 +#ifdef HAVE_FIPS_H
  47 + #include <openssl/fips.h>
  48 +#endif // HAVE_FIPS_H
  49 +
46 50 #ifdef _WIN32
47 51 #include <lib3270/win32.h>
48 52 #endif // _WIN32
... ...