diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-09-19 14:35:59 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-09-19 14:39:26 +0200 |
| commit | bb18000620db0d2f6e80209b8d9725426addc15c (patch) | |
| tree | 297c5a515b636a8a35a7d916765ffec9f1b4d170 /main/openssl | |
| parent | 7b3b75b5c977b3a6fa91c6a48349d55fc7e31663 (diff) | |
| download | aports-bb18000620db0d2f6e80209b8d9725426addc15c.tar.bz2 aports-bb18000620db0d2f6e80209b8d9725426addc15c.tar.xz | |
main/openssl: fix patch for CVE-2016-2181
Add a missing patch.
ref #6179
Diffstat (limited to 'main/openssl')
| -rw-r--r-- | main/openssl/APKBUILD | 11 | ||||
| -rw-r--r-- | main/openssl/CVE-2016-2181.patch | 28 |
2 files changed, 34 insertions, 5 deletions
diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD index 4826e2e33f..ba11da9612 100644 --- a/main/openssl/APKBUILD +++ b/main/openssl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=openssl pkgver=1.0.2h -pkgrel=3 +pkgrel=4 pkgdesc="Toolkit for SSL v2/v3 and TLS v1" url="http://openssl.org" depends= @@ -53,10 +53,11 @@ source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz # - CVE-2016-2180 # 1.0.2h-r3: # - CVE-2016-2179 -# - CVE-2016-2181 # - CVE-2016-2182 # - CVE-2016-6302 # - CVE-2016-6303 +# 1.0.2h-r4: +# - CVE-2016-2181 _builddir="$srcdir"/$pkgname-$pkgver @@ -164,7 +165,7 @@ aa16c89b283faf0fe546e3f897279c44 1002-backport-changes-from-upstream-padlock-mo 5c8e962b3d7e0082c1af432f6d0ad221 CVE-2016-2178.patch c00ded9884ee5dbe557e1ee4216bd99a CVE-2016-2179.patch 6d2276c87a17ae8615b47a1dea306d41 CVE-2016-2180.patch -8e287127e8a3f277d0722108051494de CVE-2016-2181.patch +fec771747e29df875e63bea2bc88f110 CVE-2016-2181.patch 43c75a464bb6c0110717decb76220778 CVE-2016-2182.patch 70159524406c4dc59e1c278d556696e8 CVE-2016-6302.patch 96af7035339f01cebfc26118a6f12795 CVE-2016-6303.patch" @@ -187,7 +188,7 @@ e321860623758c8a98b15dfa0b4671244e2cff34b5c62a489c43437d1053ed06 CVE-2016-2177. 7abe837d39953d0c0f694013a54f444e6f9ca0db8b98ca8aaf1d58683086784e CVE-2016-2178.patch 707bd694d828178ed6b5855a06ad70052f4c113c26f5ac2cb92133a82c0109e7 CVE-2016-2179.patch fa906541a97bf0dbb1faa600055e28a1515b073f8c2b607edbcbbb53bdd97c99 CVE-2016-2180.patch -05de3d799c631f97b68a6cc33c85fd7015a36fa77a509c2bf0387629cd91a456 CVE-2016-2181.patch +8fa93d64990cccef800faebe892bbb9a7ffff48f049e16964f4362618bec4aa2 CVE-2016-2181.patch 9bf8bf766cd6784ca50fcd99f45ebf2c57e8a821fa05644ce3b70e673f83ed53 CVE-2016-2182.patch 5751fb95b74a4a6b6091ad034a4e5919ff5e5eb186321cac82a8ab590abe76bc CVE-2016-6302.patch 3fccf95efbd51dff85cd4a04d5c589c6c06dee5cfa8d428edf93c378d106fb1e CVE-2016-6303.patch" @@ -210,7 +211,7 @@ b72436eb8d4dac42d8da76a51d46cfc03e92e162f692a7a1761201221b9c6d66b738c08270b2260f 9a90ee6b6329dea17a70c6cd62fbf349289b4beab74137adc2448c54652501c2ff47694b9154da6e610e8b947ff2070e0460fe2754b62301a6a439e16eb6fd1b CVE-2016-2178.patch 02e0f2dfcb13f22b42c3945af5a8c81d4dd12b4c73b1e30de1dd54b6af8d460b15a0d05011fce3168696f39f9a72b126cc7e8c9cd1e889a1f6c37bc5bc329820 CVE-2016-2179.patch 6c330a4a204311b21c0319de4fae7ff99819d462313cb36b4486d3e322d1d7c6393392308ff6c9f7b5a7c070584be46de232a940626ff979db88656299c87d48 CVE-2016-2180.patch -2677c29cd05c00516a6ca454814b3db17d3096767db177656249da20221eb42d86bdf4fee995c1895f97abffc44c028019fa96cf00d3f1ef53b913353bfb786e CVE-2016-2181.patch +995b2780aaaaf5b56851ab670df2c52ce1cede06e235a380d337cb40785f36677e4456b90b7782f40447c4aedcb8be00b08caf05ada5a2b95c90e073e6316970 CVE-2016-2181.patch f6a30bdbe6c2bf21b5dcd9a79fe25207c8c8df9e928935bbc84f65a2aa6719d316c5afca320df107cc5c46027859624fbad7a4f41d3d1447a9658e9949614152 CVE-2016-2182.patch fe88218c57fa8382a565d921d54f6bc20c89b5a63ebf9c80b941095baa76f102152c584ee15aac7e284f71e2bd7d04c621af9ade7719f87b69cb19caf22f823c CVE-2016-6302.patch 9f3f6f9c2be8830f444c7045a7d54d35461a665b48a6227015bc7fff10f9220d2814a3a045461e57af5b753b90738113e43d916fca28dda6e47519a4564f1f63 CVE-2016-6303.patch" diff --git a/main/openssl/CVE-2016-2181.patch b/main/openssl/CVE-2016-2181.patch index c1d114f1a4..7caafda767 100644 --- a/main/openssl/CVE-2016-2181.patch +++ b/main/openssl/CVE-2016-2181.patch @@ -321,3 +321,31 @@ index 704088d..79aaf1a 100644 -- 1.9.1 +From 26aebca74e38ae09f673c2045cc8e2ef762d265a Mon Sep 17 00:00:00 2001 +From: Matt Caswell <matt@openssl.org> +Date: Wed, 17 Aug 2016 17:55:36 +0100 +Subject: [PATCH] Update function error code + +A function error code needed updating due to merge issues. + +Reviewed-by: Richard Levitte <levitte@openssl.org> +--- + ssl/ssl.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ssl/ssl.h b/ssl/ssl.h +index 4cbac9a..2638755 100644 +--- a/ssl/ssl.h ++++ b/ssl/ssl.h +@@ -2615,7 +2615,7 @@ void ERR_load_SSL_strings(void); + # define SSL_F_DTLS1_HEARTBEAT 305 + # define SSL_F_DTLS1_OUTPUT_CERT_CHAIN 255 + # define SSL_F_DTLS1_PREPROCESS_FRAGMENT 288 +-# define SSL_F_DTLS1_PROCESS_BUFFERED_RECORDS 404 ++# define SSL_F_DTLS1_PROCESS_BUFFERED_RECORDS 424 + # define SSL_F_DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE 256 + # define SSL_F_DTLS1_PROCESS_RECORD 257 + # define SSL_F_DTLS1_READ_BYTES 258 +-- +1.9.1 + |