diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2018-10-30 15:06:07 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2018-10-30 15:06:07 +0000 |
| commit | 11917a45c7cf75b7065131cef9800ba5c9c9c699 (patch) | |
| tree | bae99e80e1aab075fec9dc4bad53857773f6ec33 /security/openssl-devel | |
| parent | misc/orange3: Update 3.15.0 -> 3.17.0 (diff) | |
security/openssl-devel: Move patches
- Add fix from upstream [1]
1: https://github.com/openssl/openssl/commit/003f1bfd
MFH: 2018Q4
Diffstat (limited to 'security/openssl-devel')
| -rw-r--r-- | security/openssl-devel/Makefile | 1 | ||||
| -rw-r--r-- | security/openssl-devel/files/patch-CVE-2018-0734 (renamed from security/openssl-devel/patch-CVE-2018-0734) | 0 | ||||
| -rw-r--r-- | security/openssl-devel/files/patch-CVE-2018-0735 (renamed from security/openssl-devel/patch-CVE-2018-0735) | 14 |
3 files changed, 8 insertions, 7 deletions
diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile index c9644680181d..e93b3daa63f5 100644 --- a/security/openssl-devel/Makefile +++ b/security/openssl-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= openssl PORTVERSION= 1.1.0i +PORTREVISION= 1 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/ diff --git a/security/openssl-devel/patch-CVE-2018-0734 b/security/openssl-devel/files/patch-CVE-2018-0734 index b2e8ad5c87bd..b2e8ad5c87bd 100644 --- a/security/openssl-devel/patch-CVE-2018-0734 +++ b/security/openssl-devel/files/patch-CVE-2018-0734 diff --git a/security/openssl-devel/patch-CVE-2018-0735 b/security/openssl-devel/files/patch-CVE-2018-0735 index 2d216c4be249..8166b91cfda1 100644 --- a/security/openssl-devel/patch-CVE-2018-0735 +++ b/security/openssl-devel/files/patch-CVE-2018-0735 @@ -9,20 +9,20 @@ Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de> (cherry picked from commit 99540ec) https://www.openssl.org/news/secadv/20181029.txt ---- crypto/ec/ec_mult.c.orig 2018-09-11 12:48:21 UTC +--- crypto/ec/ec_mult.c.orig 2018-08-14 12:45:07 UTC +++ crypto/ec/ec_mult.c -@@ -206,8 +206,8 @@ int ec_scalar_mul_ladder(const EC_GROUP +@@ -177,8 +177,8 @@ static int ec_mul_consttime(const EC_GRO */ cardinality_bits = BN_num_bits(cardinality); group_top = bn_get_top(cardinality); - if ((bn_wexpand(k, group_top + 1) == NULL) -- || (bn_wexpand(lambda, group_top + 1) == NULL)) { +- || (bn_wexpand(lambda, group_top + 1) == NULL)) + if ((bn_wexpand(k, group_top + 2) == NULL) -+ || (bn_wexpand(lambda, group_top + 2) == NULL)) { - ECerr(EC_F_EC_SCALAR_MUL_LADDER, ERR_R_BN_LIB); ++ || (bn_wexpand(lambda, group_top + 2) == NULL)) goto err; - } -@@ -244,7 +244,7 @@ int ec_scalar_mul_ladder(const EC_GROUP + + if (!BN_copy(k, scalar)) +@@ -205,7 +205,7 @@ static int ec_mul_consttime(const EC_GRO * k := scalar + 2*cardinality */ kbit = BN_is_bit_set(lambda, cardinality_bits); |