[polarssl/f20] Fix for wrong type conversion on s390(x) (#1167842)

[Morten Stevens]

commit 92ff202d216273c3f1c80a4b804ea3c3e61e47f8
Author: Morten Stevens <mstevens at imt-systems.com>
Date:   Mon Dec 1 13:59:31 2014 +0100

    Fix for wrong type conversion on s390(x) (#1167842)

 polarssl-fix-conversion.patch |   12 ++++++++++++
 polarssl.spec                 |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/polarssl-fix-conversion.patch b/polarssl-fix-conversion.patch
new file mode 100644
index 0000000..8268225
--- /dev/null
+++ b/polarssl-fix-conversion.patch
@@ -0,0 +1,12 @@
+diff -urp polarssl-1.2.12/include/polarssl/bn_mul.h p/include/polarssl/bn_mul.h
+--- polarssl-1.2.12/include/polarssl/bn_mul.h	2014-10-24 04:42:52.000000000 -0400
++++ p/include/polarssl/bn_mul.h	2014-11-25 08:44:09.163227105 -0500
+@@ -834,7 +834,7 @@
+ #define MULADDC_CORE                    \
+     r   = *(s++) * (t_udbl) b;          \
+     r0  = (t_uint) r;                   \
+-    r1  = (t_uint) r >> biL;            \
++    r1  = (t_uint) (r >> biL);          \
+     r0 += c;  r1 += (r0 <  c);          \
+     r0 += *d; r1 += (r0 < *d);          \
+     c = r1; *(d++) = r0;
diff --git a/polarssl.spec b/polarssl.spec
index 27cd9df..166a1b6 100644
--- a/polarssl.spec
+++ b/polarssl.spec
@@ -1,11 +1,12 @@
 Name: polarssl
 Version: 1.2.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Light-weight cryptographic and SSL/TLS library
 Group: System Environment/Libraries
 License: GPLv2+
 URL: http://polarssl.org/
 Source0: http://polarssl.org/download/%{name}-%{version}-gpl.tgz
+Patch0: polarssl-fix-conversion.patch
 
 BuildRequires: cmake
 BuildRequires: doxygen
@@ -36,6 +37,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .polarssl-fix-conversion
 
 %build
 %cmake -D CMAKE_BUILD_TYPE:String="Release" -D USE_SHARED_POLARSSL_LIBRARY:BOOL=1 .
@@ -67,6 +69,9 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/polarssl
 %{_libdir}/*.a
 
 %changelog
+* Mon Dec 01 2014 Morten Stevens <mstevens at imt-systems.com> - 1.2.12-2
+- Fix for wrong type conversion on s390(x) (#1167842)
+
 * Wed Nov 12 2014 Morten Stevens <mstevens at imt-systems.com> - 1.2.12-1
 - Update to 1.2.12
 - CVE-2014-8628 (#1159845)