- updated to 2.3.0

- removed obsolete x32 patch

diff --git a/mbedtls-x32.patch b/mbedtls-x32.patch
deleted file mode 100644 (file)
index 6cc51b1..0000000
--- a/mbedtls-x32.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- polarssl-1.3.9/library/aesni.c.orig        2015-05-07 19:36:49.789268090 +0200
-+++ polarssl-1.3.9/library/aesni.c     2015-05-07 19:38:05.120256538 +0200
-@@ -99,7 +99,11 @@
-     asm( "movdqu    (%3), %%xmm0    \n\t" // load input
-          "movdqu    (%1), %%xmm1    \n\t" // load round key 0
-          "pxor      %%xmm1, %%xmm0  \n\t" // round 0
-+#ifdef __ILP32__
-+         "add       $16, %1         \n\t" // point to next round key
-+#else
-          "addq      $16, %1         \n\t" // point to next round key
-+#endif
-          "subl      $1, %0          \n\t" // normal rounds = nr - 1
-          "test      %2, %2          \n\t" // mode?
-          "jz        2f              \n\t" // 0 = decrypt
-@@ -107,7 +111,11 @@
-          "1:                        \n\t" // encryption loop
-          "movdqu    (%1), %%xmm1    \n\t" // load round key
-          AESENC     xmm1_xmm0      "\n\t" // do round
-+#ifdef __ILP32__
-+         "add       $16, %1         \n\t" // point to next round key
-+#else
-          "addq      $16, %1         \n\t" // point to next round key
-+#endif
-          "subl      $1, %0          \n\t" // loop
-          "jnz       1b              \n\t"
-          "movdqu    (%1), %%xmm1    \n\t" // load round key
-@@ -117,7 +125,11 @@
-          "2:                        \n\t" // decryption loop
-          "movdqu    (%1), %%xmm1    \n\t"
-          AESDEC     xmm1_xmm0      "\n\t" // do round
-+#ifdef __ILP32__
-+         "add       $16, %1         \n\t"
-+#else
-          "addq      $16, %1         \n\t"
-+#endif
-          "subl      $1, %0          \n\t"
-          "jnz       2b              \n\t"
-          "movdqu    (%1), %%xmm1    \n\t" // load round key

diff --git a/mbedtls.spec b/mbedtls.spec
index 4b3fc90be53bbbc6b6743e9b24638c773f4be66d..b97a8ec5c9f9525a3ea96813fd13c5e30a6f44ba 100644 (file)
--- a/mbedtls.spec
+++ b/mbedtls.spec
@@ -1,13 +1,12 @@
 Summary:       Light-weight cryptographic and SSL/TLS library
 Summary(pl.UTF-8):     Lekka biblioteka kryptograficzna oraz SSL/TLS
 Name:          mbedtls
-Version:       2.2.1
+Version:       2.3.0
 Release:       1
 License:       GPL v2+
 Group:         Libraries
 Source0:       https://tls.mbed.org/code/releases/%{name}-%{version}-gpl.tgz
-# Source0-md5: b6909d94600fc5f644e9bca52e96fb27
-Patch0:                %{name}-x32.patch
+# Source0-md5: 3f396d21b9c86c0a11ac9ba0b6e6f999
 URL:           https://tls.mbed.org/
 BuildRequires: cmake >= 2.6
 BuildRequires: doxygen
@@ -54,7 +53,6 @@ Statyczna biblioteka mbedTLS.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 install -d build