6 files changed, 16 insertions, 52 deletions
diff --git a/package/libs/cyassl/Makefile b/package/libs/cyassl/Makefile
index 11ca9c2..03f78cf 100644
--- a/package/libs/cyassl/Makefile
+++ b/package/libs/cyassl/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cyassl
-PKG_VERSION:=3.1.0
+PKG_VERSION:=3.2.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
 PKG_SOURCE_URL:=http://www.yassl.com/
-PKG_MD5SUM:=72477eb50697e759d309c49cb1aef18a
+PKG_MD5SUM:=a80493c224ff86e45dc333c06d5edb88
 
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
diff --git a/package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch b/package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch
index 82e08c0..5463cb0 100644
--- a/package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch
+++ b/package/libs/cyassl/patches/200-SSL_accept-handle-hello-garbage.patch
@@ -1,6 +1,6 @@
 --- a/src/internal.c
 +++ b/src/internal.c
-@@ -5600,6 +5600,10 @@ int ProcessReply(CYASSL* ssl)
+@@ -6037,6 +6037,10 @@ int ProcessReply(CYASSL* ssl)
                  b1 =
                  ssl->buffers.inputBuffer.buffer[ssl->buffers.inputBuffer.idx++];
                  ssl->curSize = (word16)(((b0 & 0x7f) << 8) | b1);
diff --git a/package/libs/openssl/patches/160-disable_doc_tests.patch b/package/libs/openssl/patches/160-disable_doc_tests.patch
index 54f58fb..e31ffa5 100644
--- a/package/libs/openssl/patches/160-disable_doc_tests.patch
+++ b/package/libs/openssl/patches/160-disable_doc_tests.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -137,7 +137,7 @@ FIPSCANLIB=
+@@ -138,7 +138,7 @@ FIPSCANLIB=
  
  BASEADDR=0xFB00000
  
@@ -9,7 +9,7 @@
  ENGDIRS= ccgost
  SHLIBDIRS= crypto ssl
  
-@@ -155,7 +155,7 @@ SDIRS=  \
+@@ -156,7 +156,7 @@ SDIRS=  \
  
  # tests to perform.  "alltests" is a special word indicating that all tests
  # should be performed.
@@ -18,7 +18,7 @@
  
  MAKEFILE= Makefile
  
-@@ -169,7 +169,7 @@ SHELL=/bin/sh
+@@ -170,7 +170,7 @@ SHELL=/bin/sh
  
  TOP=    .
  ONEDIRS=out tmp
@@ -27,7 +27,7 @@
  WDIRS=  windows
  LIBS=   libcrypto.a libssl.a
  SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
-@@ -270,7 +270,7 @@ reflect:
+@@ -271,7 +271,7 @@ reflect:
  	@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
  
  sub_all: build_all
@@ -36,7 +36,7 @@
  
  build_libs: build_crypto build_ssl build_engines
  
-@@ -540,7 +540,7 @@ dist:
+@@ -538,7 +538,7 @@ dist:
  dist_pem_h:
  	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
  
@@ -47,7 +47,7 @@
  	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
 --- a/Makefile.org
 +++ b/Makefile.org
-@@ -538,7 +538,7 @@ dist:
+@@ -536,7 +536,7 @@ dist:
  dist_pem_h:
  	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
  
diff --git a/package/libs/openssl/patches/210-termios_fix.patch b/package/libs/openssl/patches/210-termios_fix.patch
index f14960c..957c5cf 100644
--- a/package/libs/openssl/patches/210-termios_fix.patch
+++ b/package/libs/openssl/patches/210-termios_fix.patch
@@ -1,6 +1,6 @@
 --- a/crypto/ui/ui_openssl.c
 +++ b/crypto/ui/ui_openssl.c
-@@ -190,7 +190,7 @@
+@@ -194,7 +194,7 @@
  # undef  SGTTY
  #endif
  
diff --git a/package/libs/polarssl/Makefile b/package/libs/polarssl/Makefile
index 081b2c1..384853e 100644
--- a/package/libs/polarssl/Makefile
+++ b/package/libs/polarssl/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2011-2013 OpenWrt.org
+# Copyright (C) 2011-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,15 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=polarssl
-PKG_VERSION:=1.3.8
-PKG_RELEASE:=1
+PKG_VERSION:=1.3.9
+PKG_RELEASE:=2
 PKG_USE_MIPS16:=0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
 PKG_SOURCE_URL:=https://polarssl.org/code/releases
-PKG_MD5SUM:=d1a2b4f21727e888f143414d2e3144e6
+PKG_MD5SUM:=48af7d1f0d5de512cbd6dacf5407884c
 
 PKG_BUILD_PARALLEL:=1
+PKG_LICENSE:=GPL-2.0+
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -51,6 +52,7 @@ CMAKE_OPTIONS += \
 	-DCMAKE_BUILD_TYPE:String="Release" \
 	-DUSE_SHARED_POLARSSL_LIBRARY:Bool=ON \
 	-DENABLE_TESTING:Bool=OFF \
+	-DENABLE_PROGRAMS:Bool=OFF \
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
diff --git a/package/libs/polarssl/patches/210-gen_key_config_fix.patch b/package/libs/polarssl/patches/210-gen_key_config_fix.patch
deleted file mode 100644
index b17e744..0000000
--- a/package/libs/polarssl/patches/210-gen_key_config_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/programs/pkey/gen_key.c
-+++ b/programs/pkey/gen_key.c
-@@ -215,7 +215,9 @@ int main( int argc, char *argv[] )
- 
-     opt.type                = DFL_TYPE;
-     opt.rsa_keysize         = DFL_RSA_KEYSIZE;
-+#if defined(POLARSSL_ECP_C)
-     opt.ec_curve            = DFL_EC_CURVE;
-+#endif
-     opt.filename            = DFL_FILENAME;
-     opt.format              = DFL_FORMAT;
-     opt.use_dev_random      = DFL_USE_DEV_RANDOM;
-@@ -231,8 +233,10 @@ int main( int argc, char *argv[] )
-         {
-             if( strcmp( q, "rsa" ) == 0 )
-                 opt.type = POLARSSL_PK_RSA;
-+#if defined(POLARSSL_ECP_C)
-             else if( strcmp( q, "ec" ) == 0 )
-                 opt.type = POLARSSL_PK_ECKEY;
-+#endif
-             else
-                 goto usage;
-         }
-@@ -251,12 +255,14 @@ int main( int argc, char *argv[] )
-             if( opt.rsa_keysize < 1024 || opt.rsa_keysize > 8192 )
-                 goto usage;
-         }
-+#if defined(POLARSSL_ECP_C)
-         else if( strcmp( p, "ec_curve" ) == 0 )
-         {
-             if( ( curve_info = ecp_curve_info_from_name( q ) ) == NULL )
-                 goto usage;
-             opt.ec_curve = curve_info->grp_id;
-         }
-+#endif
-         else if( strcmp( p, "filename" ) == 0 )
-             opt.filename = q;
-         else if( strcmp( p, "use_dev_random" ) == 0 )