cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security/openssl-devel: Move patches

Browse Source 
- Add fix from upstream [1]

1: https://github.com/openssl/openssl/commit/003f1bfd

MFH:		2018Q4
This commit is contained in:
Bernard Spil 2018-10-30 15:06:07 +00:00
parent 0a10f8d85b
commit 11917a45c7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=483493
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
security/openssl-devel/Makefile
View File

@ -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/

0
security/openssl-devel/patch-CVE-2018-0734 → security/openssl-devel/files/patch-CVE-2018-0734
View File

14
security/openssl-devel/patch-CVE-2018-0735 → security/openssl-devel/files/patch-CVE-2018-0735
View File

@ -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);