From 280fdac18fc1a4e0aa88698a5f7b055bf3f76934 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 3 Dec 2016 16:07:14 +0100
Subject: [PATCH] polarssl: update to version 1.3.18

This fixes two minor security problems.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 package/libs/polarssl/Makefile                |  4 +--
 .../polarssl/patches/200-reduce_config.patch  | 30 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/package/libs/polarssl/Makefile b/package/libs/polarssl/Makefile
index 2f2029f9d8..52c91dcca6 100644
--- a/package/libs/polarssl/Makefile
+++ b/package/libs/polarssl/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=polarssl
 SRC_PKG_NAME:=mbedtls
-PKG_VERSION:=1.3.17
+PKG_VERSION:=1.3.18
 PKG_RELEASE:=1
 PKG_USE_MIPS16:=0
 
 PKG_SOURCE:=$(SRC_PKG_NAME)-$(PKG_VERSION)-gpl.tgz
 PKG_SOURCE_URL:=https://tls.mbed.org/download/
-PKG_MD5SUM:=f5beb43e850283915e3e0f8d37495eade3bfb5beedfb61e7b8da70d4c68edb82
+PKG_MD5SUM:=a229217182e024847deba3cb70bdd17e5ff4ffd9ff306cbbccfdbdff41950ea1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(SRC_PKG_NAME)-$(PKG_VERSION)
 
diff --git a/package/libs/polarssl/patches/200-reduce_config.patch b/package/libs/polarssl/patches/200-reduce_config.patch
index 9e2734aa6c..491ecec388 100644
--- a/package/libs/polarssl/patches/200-reduce_config.patch
+++ b/package/libs/polarssl/patches/200-reduce_config.patch
@@ -99,8 +99,8 @@
 + */
  
  /**
-  * \def POLARSSL_SSL_AEAD_RANDOM_IV
-@@ -1151,8 +1151,8 @@
+  * \def POLARSSL_SSL_ALL_ALERT_MESSAGES
+@@ -1139,8 +1139,8 @@
   * Requires: POLARSSL_VERSION_C
   *
   * Comment this to disable run-time checking and save ROM space
@@ -110,7 +110,7 @@
  
  /**
   * \def POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3
-@@ -1470,8 +1470,8 @@
+@@ -1469,8 +1469,8 @@
   *      TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384
   *      TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
   *      TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
@@ -120,7 +120,7 @@
  
  /**
   * \def POLARSSL_CCM_C
-@@ -1498,8 +1498,8 @@
+@@ -1497,8 +1497,8 @@
   * Requires: POLARSSL_PEM_PARSE_C
   *
   * This module is used for testing (ssl_client/server).
@@ -130,7 +130,7 @@
  
  /**
   * \def POLARSSL_CIPHER_C
-@@ -1538,8 +1538,8 @@
+@@ -1537,8 +1537,8 @@
   *          library/ssl_tls.c
   *
   * This module provides debugging functions.
@@ -140,7 +140,7 @@
  
  /**
   * \def POLARSSL_DES_C
-@@ -1594,8 +1594,8 @@
+@@ -1593,8 +1593,8 @@
   *      ECDHE-ECDSA, ECDHE-RSA, DHE-PSK
   *
   * Requires: POLARSSL_ECP_C
@@ -150,7 +150,7 @@
  
  /**
   * \def POLARSSL_ECDSA_C
-@@ -1609,8 +1609,8 @@
+@@ -1608,8 +1608,8 @@
   *      ECDHE-ECDSA
   *
   * Requires: POLARSSL_ECP_C, POLARSSL_ASN1_WRITE_C, POLARSSL_ASN1_PARSE_C
@@ -160,7 +160,7 @@
  
  /**
   * \def POLARSSL_ECP_C
-@@ -1622,8 +1622,8 @@
+@@ -1621,8 +1621,8 @@
   *          library/ecdsa.c
   *
   * Requires: POLARSSL_BIGNUM_C and at least one POLARSSL_ECP_DP_XXX_ENABLED
@@ -170,7 +170,7 @@
  
  /**
   * \def POLARSSL_ENTROPY_C
-@@ -1699,8 +1699,8 @@
+@@ -1698,8 +1698,8 @@
   * Requires: POLARSSL_MD_C
   *
   * Uncomment to enable the HMAC_DRBG random number geerator.
@@ -180,7 +180,7 @@
  
  /**
   * \def POLARSSL_MD_C
-@@ -1826,8 +1826,8 @@
+@@ -1825,8 +1825,8 @@
   * Requires: POLARSSL_HAVE_ASM
   *
   * This modules adds support for the VIA PadLock on x86.
@@ -190,7 +190,7 @@
  
  /**
   * \def POLARSSL_PBKDF2_C
-@@ -1992,8 +1992,8 @@
+@@ -1991,8 +1991,8 @@
   * Module:  library/ripemd160.c
   * Caller:  library/md.c
   *
@@ -200,7 +200,7 @@
  
  /**
   * \def POLARSSL_RSA_C
-@@ -2072,8 +2072,8 @@
+@@ -2071,8 +2071,8 @@
   * Caller:
   *
   * Requires: POLARSSL_SSL_CACHE_C
@@ -210,7 +210,7 @@
  
  /**
   * \def POLARSSL_SSL_CLI_C
-@@ -2149,8 +2149,8 @@
+@@ -2148,8 +2148,8 @@
   * Caller:  library/havege.c
   *
   * This module is used by the HAVEGE random number generator.
@@ -220,7 +220,7 @@
  
  /**
   * \def POLARSSL_VERSION_C
-@@ -2160,8 +2160,8 @@
+@@ -2159,8 +2159,8 @@
   * Module:  library/version.c
   *
   * This module provides run-time version information.
@@ -230,7 +230,7 @@
  
  /**
   * \def POLARSSL_X509_USE_C
-@@ -2270,8 +2270,8 @@
+@@ -2269,8 +2269,8 @@
   *
   * Module:  library/xtea.c
   * Caller:
-- 
2.30.2