diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-03-29 23:14:47 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-03-29 23:14:47 +0000 |
| commit | 30edff3c2f5d9c8019217f087b5ddb0cd3caade9 (patch) | |
| tree | 1c8cb52e389fc07daf97d6cad27a195a654c4c87 /package/openssl | |
| parent | dc4712f88790ae4a7211985f3e91e7aec5cb1968 (diff) | |
| download | upstream-30edff3c2f5d9c8019217f087b5ddb0cd3caade9.tar.gz upstream-30edff3c2f5d9c8019217f087b5ddb0cd3caade9.tar.bz2 upstream-30edff3c2f5d9c8019217f087b5ddb0cd3caade9.zip | |
openssl: add patch for CVE-2010-0740 ("Record of death") vulnerability
SVN-Revision: 20592
Diffstat (limited to 'package/openssl')
| -rw-r--r-- | package/openssl/Makefile | 2 | ||||
| -rw-r--r-- | package/openssl/patches/400-cve-2010-0740.patch | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/package/openssl/Makefile b/package/openssl/Makefile index e7a74905fd..9f80a98f39 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl PKG_VERSION:=0.9.8m -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.openssl.org/source/ \ diff --git a/package/openssl/patches/400-cve-2010-0740.patch b/package/openssl/patches/400-cve-2010-0740.patch new file mode 100644 index 0000000000..4c893eb38d --- /dev/null +++ b/package/openssl/patches/400-cve-2010-0740.patch @@ -0,0 +1,15 @@ +--- a/ssl/s3_pkt.c ++++ b/ssl/s3_pkt.c +@@ -291,9 +291,9 @@ again: + if (version != s->version) + { + SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_WRONG_VERSION_NUMBER); +- /* Send back error using their +- * version number :-) */ +- s->version=version; ++ if ((s->version & 0xFF00) == (version & 0xFF00)) ++ /* Send back error using their minor version number :-) */ ++ s->version = (unsigned short)version; + al=SSL_AD_PROTOCOL_VERSION; + goto f_err; + } |