- use general-purpose TLS_{client,server}_method(), fixes build against openssl-1.1

- release 4

diff --git a/libmowgli2-openssl-1.1.patch b/libmowgli2-openssl-1.1.patch
new file mode 100644 (file)
index 0000000..0ef36b5
--- /dev/null
+++ b/libmowgli2-openssl-1.1.patch
@@ -0,0 +1,52 @@
+--- libmowgli-2-libmowgli-2.0.0/src/libmowgli/vio/vio_openssl.c~       2012-04-18 12:56:14.000000000 +0200
++++ libmowgli-2-libmowgli-2.0.0/src/libmowgli/vio/vio_openssl.c        2018-09-25 00:43:57.628671319 +0200
+@@ -134,23 +134,7 @@
+       mowgli_ssl_connection_t *connection = vio->privdata;
+       const SSL_METHOD *method;
+ 
+-      switch (connection->settings.ssl_version)
+-      {
+-      case MOWGLI_VIO_SSLFLAGS_SSLV2:
+-              method = SSLv23_server_method();
+-              break;
+-      case MOWGLI_VIO_SSLFLAGS_SSLV3:
+-              method = SSLv3_server_method();
+-              break;
+-      case MOWGLI_VIO_SSLFLAGS_TLSV10:
+-      case MOWGLI_VIO_SSLFLAGS_TLSV11:
+-      case MOWGLI_VIO_SSLFLAGS_TLSV12:
+-              method = TLSv1_server_method();
+-              break;
+-      default:
+-              /* Compat method */
+-              method = SSLv23_server_method();
+-      }
++      method = TLS_server_method();
+       
+       connection->ssl_context = SSL_CTX_new((SSL_METHOD *)method);
+       if (connection->ssl_context == NULL)
+@@ -266,23 +250,7 @@
+ 
+       vio->error.op = MOWGLI_VIO_ERR_OP_CONNECT;
+ 
+-      switch (connection->settings.ssl_version)
+-      {
+-      case MOWGLI_VIO_SSLFLAGS_SSLV2:
+-              method = SSLv23_client_method();
+-              break;
+-      case MOWGLI_VIO_SSLFLAGS_SSLV3:
+-              method = SSLv3_client_method();
+-              break;
+-      case MOWGLI_VIO_SSLFLAGS_TLSV10:
+-      case MOWGLI_VIO_SSLFLAGS_TLSV11:
+-      case MOWGLI_VIO_SSLFLAGS_TLSV12:
+-              method = TLSv1_client_method();
+-              break;
+-      default:
+-              /* Compat method */
+-              method = SSLv23_client_method();
+-      }
++      method = TLS_client_method();
+ 
+       /* Cast is to eliminate an excessively bogus warning on old OpenSSL --Elizacat */
+       connection->ssl_context = SSL_CTX_new((SSL_METHOD *)method);

diff --git a/libmowgli2.spec b/libmowgli2.spec
index 68d51d44fd0c0aef2f59bf91499f1928daa430a8..aa384503ffb69fdc5a6a8a2a2b0808108f0de6a8 100644 (file)
--- a/libmowgli2.spec
+++ b/libmowgli2.spec
@@ -6,11 +6,12 @@ Summary:      Development framework for C (like GLib)
 Summary(pl.UTF-8):     Szkielet programistyczny dla C (podobny do GLiba)
 Name:          libmowgli2
 Version:       2.0.0
-Release:       3
+Release:       4
 License:       MIT
 Group:         Libraries
 Source0:       https://github.com/atheme/libmowgli-2/archive/libmowgli-%{version}.tar.gz
 # Source0-md5: 0b8cf8b66d745d40f186e3cbd22fdc0e
+Patch0:                %{name}-openssl-1.1.patch
 URL:           https://github.com/atheme/libmowgli-2/
 BuildRequires: openssl-devel
 BuildRequires: sed >= 4.0
@@ -60,6 +61,7 @@ Biblioteka statyczna libmowgli.
 
 %prep
 %setup -q -n libmowgli-2-libmowgli-%{version}
+%patch0 -p1
 
 %{__sed} -i -e '/^\.SILENT/d' buildsys.mk.in