adjust openssl patch

BR: openssl-devel zlib-devel (for tests mostly)
This commit is contained in:
Rex Dieter 2017-05-22 09:55:38 -05:00
parent 1f4b76d10b
commit 415db96ff3
2 changed files with 19 additions and 9 deletions

View File

@ -1,17 +1,21 @@
diff -up websocketpp-0.7.0/websocketpp/transport/asio/security/tls.hpp.openssl11 websocketpp-0.7.0/websocketpp/transport/asio/security/tls.hpp
--- websocketpp-0.7.0/websocketpp/transport/asio/security/tls.hpp.openssl11 2016-02-22 07:30:10.000000000 -0600
+++ websocketpp-0.7.0/websocketpp/transport/asio/security/tls.hpp 2017-05-17 12:19:55.418658051 -0500
@@ -355,8 +355,13 @@ protected:
+++ websocketpp-0.7.0/websocketpp/transport/asio/security/tls.hpp 2017-05-22 09:49:43.613622484 -0500
@@ -355,13 +355,17 @@ protected:
template <typename ErrorCodeType>
lib::error_code translate_ec(ErrorCodeType ec) {
if (ec.category() == lib::asio::error::get_ssl_category()) {
+#if defined SSL_R_SHORT_READ
+#ifdef SSL_R_SHORT_READ
if (ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ) {
return make_error_code(transport::error::tls_short_read);
+#else
+ if (ERR_GET_REASON(ec.value()) == boost::asio::ssl::error::stream_truncated) {
+ return make_error_code(boost::asio::ssl::error::stream_truncated);
+#endif
} else {
+#endif
// We know it is a TLS related error, but otherwise don't know
// more. Pass through as TLS generic.
return make_error_code(transport::error::tls_error);
+#ifdef SSL_R_SHORT_READ
}
+#endif
} else {
// We don't know any more information about this error so pass
// through

View File

@ -2,7 +2,7 @@
Name: websocketpp
Summary: C++ WebSocket Protocol Library
Version: 0.7.0
Release: 4%{?dist}
Release: 5%{?dist}
License: BSD
Url: http://www.zaphoyd.com/websocketpp
@ -19,7 +19,9 @@ Patch2: websocketpp-0.7.0-openssl11.patch
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: pkgconfig
# needed for tests mostly
BuildRequires: pkgconfig(openssl)
BuildRequires: zlib-devel
%description
WebSocket++ is an open source (BSD license) header only C++ library
@ -73,6 +75,10 @@ make test -C %{_target_platform}
%changelog
* Mon May 22 2017 Rex Dieter <rdieter@fedoraproject.org> - 0.7.0-5
- adjust openssl patch
- BR: openssl-devel zlib-devel (for tests mostly)
* Wed May 17 2017 Rex Dieter <rdieter@fedoraproject.org> - 0.7.0-4
- tls.hpp, SSL_R_SHORT_READ undefined in openssl-1.1 (#1449163)
- enable tests