Download as
Browse Code »

Commit 7527a2d7ccf2dc0d2459f496361d9b4d6e8a714f

Authored by Perry Werneck
1 parent e320eacc
Exists in master and in 1 other branch develop

Fixing behavior on self signed certificate.

Showing 4 changed files with 20 additions and 21 deletions   Show diff stats
@@ -389,11 +389,11 @@ dnl SSL Security options @@ -389,11 +389,11 @@ dnl SSL Security options
389 dnl --------------------------------------------------------------------------- 389 dnl ---------------------------------------------------------------------------
390 390
391 AC_ARG_ENABLE([self-signed-cert-check], 391 AC_ARG_ENABLE([self-signed-cert-check],
392 - [AS_HELP_STRING([--enable-self-signed-cert-check], [Reject SSL connection when host presents a self signed certificate])], 392 + [AS_HELP_STRING([--enable-self-signed-cert-check], [Emit Warning when host presents a self signed certificate])],
393 [ 393 [
394 app_cv_self_signed_certs="$enableval" 394 app_cv_self_signed_certs="$enableval"
395 ],[ 395 ],[
396 - app_cv_self_signed_certs="no" 396 + app_cv_self_signed_certs="yes"
397 ]) 397 ])
398 398
399 if test "$app_cv_self_signed_certs" == "yes"; then 399 if test "$app_cv_self_signed_certs" == "yes"; then
@@ -518,7 +518,7 @@ AC_ARG_WITH([sdk-version], [AS_HELP_STRING([--with-sdk-version], [Setup library @@ -518,7 +518,7 @@ AC_ARG_WITH([sdk-version], [AS_HELP_STRING([--with-sdk-version], [Setup library
518 AC_DEFINE(LIB3270_SDK_VERSION,$app_cv_sdkversion,[The SDK version number]) 518 AC_DEFINE(LIB3270_SDK_VERSION,$app_cv_sdkversion,[The SDK version number])
519 AC_SUBST(LIB3270_SDK_VERSION,$app_cv_sdkversion) 519 AC_SUBST(LIB3270_SDK_VERSION,$app_cv_sdkversion)
520 520
521 -AC_ARG_WITH([default-host], [AS_HELP_STRING([--with-default-host], [Set lib3270 default host url])], 521 +AC_ARG_WITH([default-host], [AS_HELP_STRING([--with-default-host], [Set lib3270 default host url])],
522 [ app_default_host="\"$withval\""], 522 [ app_default_host="\"$withval\""],
523 [ app_default_host=""]) 523 [ app_default_host=""])
524 524
@@ -650,7 +650,7 @@ case "$host" in @@ -650,7 +650,7 @@ case "$host" in
650 650
651 *-apple-darwin*) 651 *-apple-darwin*)
652 AC_PATH_TOOL([CURLCONFIG], [curl-config], [no]) 652 AC_PATH_TOOL([CURLCONFIG], [curl-config], [no])
653 - 653 +
654 if test x$CURLCONFIG = xno; then 654 if test x$CURLCONFIG = xno; then
655 AC_MSG_NOTICE([Building without CURL support]) 655 AC_MSG_NOTICE([Building without CURL support])
656 AC_SUBST(LIBCURL_CFLAGS) 656 AC_SUBST(LIBCURL_CFLAGS)
@@ -662,13 +662,13 @@ case "$host" in @@ -662,13 +662,13 @@ case "$host" in
662 AC_SUBST(LIBCURL_LIBS,"$($CURLCONFIG --libs)") 662 AC_SUBST(LIBCURL_LIBS,"$($CURLCONFIG --libs)")
663 fi 663 fi
664 ;; 664 ;;
665 - 665 +
666 *) 666 *)
667 PKG_CHECK_MODULES( [LIBCURL], [libcurl], AC_DEFINE(HAVE_LIBCURL,[],[Do we have libcurl?]), AC_MSG_ERROR([libcurl not present.]) ) 667 PKG_CHECK_MODULES( [LIBCURL], [libcurl], AC_DEFINE(HAVE_LIBCURL,[],[Do we have libcurl?]), AC_MSG_ERROR([libcurl not present.]) )
668 AC_SUBST(LIBCURL_CFLAGS) 668 AC_SUBST(LIBCURL_CFLAGS)
669 AC_SUBST(LIBCURL_LIBS) 669 AC_SUBST(LIBCURL_LIBS)
670 ;; 670 ;;
671 - 671 +
672 esac 672 esac
673 673
674 dnl --------------------------------------------------------------------------- 674 dnl ---------------------------------------------------------------------------
@@ -10,11 +10,10 @@ @@ -10,11 +10,10 @@
10 </service> 10 </service>
11 11
12 <!-- https://github.com/openSUSE/obs-service-extract_file --> 12 <!-- https://github.com/openSUSE/obs-service-extract_file -->
13 -  
14 - <service name="extract_file"> 13 + <!-- service name="extract_file">
15 <param name="archive">*.tar</param> 14 <param name="archive">*.tar</param>
16 <param name="files">*/rpm/lib3270.spec</param> 15 <param name="files">*/rpm/lib3270.spec</param>
17 - </service> 16 + </service -->
18 17
19 <service name="extract_file"> 18 <service name="extract_file">
20 <param name="archive">*.tar</param> 19 <param name="archive">*.tar</param>
rpm/lib3270.spec
  Diff comments   View file @7527a2d
1 # 1 #
2 # spec file for package lib3270 2 # spec file for package lib3270
3 # 3 #
4 -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. 4 +# Copyright (c) 2022 SUSE LLC
5 # Copyright (c) <2008> <Banco do Brasil S.A.> 5 # Copyright (c) <2008> <Banco do Brasil S.A.>
6 # 6 #
7 # All modifications and additions to the file contributed by third parties 7 # All modifications and additions to the file contributed by third parties
@@ -29,15 +29,15 @@ BuildRequires: autoconf &gt;= 2.61 @@ -29,15 +29,15 @@ BuildRequires: autoconf &gt;= 2.61
29 BuildRequires: automake 29 BuildRequires: automake
30 BuildRequires: binutils 30 BuildRequires: binutils
31 BuildRequires: coreutils 31 BuildRequires: coreutils
32 -BuildRequires: libtool  
33 BuildRequires: fdupes 32 BuildRequires: fdupes
34 BuildRequires: gcc-c++ 33 BuildRequires: gcc-c++
35 BuildRequires: gettext-devel 34 BuildRequires: gettext-devel
  35 +BuildRequires: libtool
36 BuildRequires: m4 36 BuildRequires: m4
37 BuildRequires: pkgconfig 37 BuildRequires: pkgconfig
  38 +BuildRequires: xz
38 BuildRequires: pkgconfig(libcurl) 39 BuildRequires: pkgconfig(libcurl)
39 BuildRequires: pkgconfig(libssl) 40 BuildRequires: pkgconfig(libssl)
40 -BuildRequires: xz  
41 41
42 %if 0%{?centos_version} 42 %if 0%{?centos_version}
43 # CENTOS Requires gdb for debuginfo 43 # CENTOS Requires gdb for debuginfo
@@ -54,8 +54,8 @@ For more details, see https://softwarepublico.gov.br/social/pw3270/ . @@ -54,8 +54,8 @@ For more details, see https://softwarepublico.gov.br/social/pw3270/ .
54 %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} 54 %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
55 55
56 %package -n %{name}-%{_libvrs} 56 %package -n %{name}-%{_libvrs}
57 -Summary: TN3270 Access library  
58 -Group: Development/Libraries/C and C++ 57 +Summary: TN3270 Access library
  58 +Group: Development/Libraries/C and C++
59 59
60 %description -n %{name}-%{_libvrs} 60 %description -n %{name}-%{_libvrs}
61 TN3270 access library, originally designed as part of the pw3270 application. 61 TN3270 access library, originally designed as part of the pw3270 application.
@@ -63,9 +63,9 @@ TN3270 access library, originally designed as part of the pw3270 application. @@ -63,9 +63,9 @@ TN3270 access library, originally designed as part of the pw3270 application.
63 For more details, see https://softwarepublico.gov.br/social/pw3270/ . 63 For more details, see https://softwarepublico.gov.br/social/pw3270/ .
64 64
65 %package devel 65 %package devel
66 -Summary: TN3270 Access library development files  
67 -Requires: %{name}-%{_libvrs} = %{version}  
68 -Group: Development/Libraries/C and C++ 66 +Summary: TN3270 Access library development files
  67 +Requires: %{name}-%{_libvrs} = %{version}
  68 +Group: Development/Libraries/C and C++
69 69
70 %description devel 70 %description devel
71 Header files for the TN3270 access library. 71 Header files for the TN3270 access library.
src/network_modules/openssl/messages.c
  Diff comments   View file @7527a2d
@@ -244,9 +244,9 @@ const LIB3270_SSL_MESSAGE * lib3270_openssl_message_from_id(long id) { @@ -244,9 +244,9 @@ const LIB3270_SSL_MESSAGE * lib3270_openssl_message_from_id(long id) {
244 .message = { 244 .message = {
245 .name = "X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT", 245 .name = "X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT",
246 #ifdef SSL_ENABLE_SELF_SIGNED_CERT_CHECK 246 #ifdef SSL_ENABLE_SELF_SIGNED_CERT_CHECK
247 - .type = LIB3270_NOTIFY_SECURE,  
248 -#else  
249 .type = LIB3270_NOTIFY_WARNING, 247 .type = LIB3270_NOTIFY_WARNING,
  248 +#else
  249 + .type = LIB3270_NOTIFY_SECURE,
250 #endif // SSL_ENABLE_SELF_SIGNED_CERT_CHECK 250 #endif // SSL_ENABLE_SELF_SIGNED_CERT_CHECK
251 .icon = "security-medium", 251 .icon = "security-medium",
252 .summary = N_( "Self signed certificate" ), 252 .summary = N_( "Self signed certificate" ),
@@ -260,9 +260,9 @@ const LIB3270_SSL_MESSAGE * lib3270_openssl_message_from_id(long id) { @@ -260,9 +260,9 @@ const LIB3270_SSL_MESSAGE * lib3270_openssl_message_from_id(long id) {
260 .message = { 260 .message = {
261 .name = "X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN", 261 .name = "X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN",
262 #ifdef SSL_ENABLE_SELF_SIGNED_CERT_CHECK 262 #ifdef SSL_ENABLE_SELF_SIGNED_CERT_CHECK
263 - .type = LIB3270_NOTIFY_SECURE,  
264 -#else  
265 .type = LIB3270_NOTIFY_INFO, 263 .type = LIB3270_NOTIFY_INFO,
  264 +#else
  265 + .type = LIB3270_NOTIFY_SECURE,
266 #endif // SSL_ENABLE_SELF_SIGNED_CERT_CHECK 266 #endif // SSL_ENABLE_SELF_SIGNED_CERT_CHECK
267 .icon = "security-low", 267 .icon = "security-low",
268 .label = N_("Continue"), 268 .label = N_("Continue"),