aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2016-09-26 08:21:29 +0000
committerXin LI <delphij@FreeBSD.org>2016-09-26 08:21:29 +0000
commit69f7d1337c31dddaee8e9bb03a2e5d28d758faab (patch)
treed1c713e0b855f98b85ce0882e9f243e7387354bd
parent6107c6581a0c4f2dcc21288dd2bbde22c4909d85 (diff)
downloadsrc-69f7d1337c31dddaee8e9bb03a2e5d28d758faab.tar.gz
src-69f7d1337c31dddaee8e9bb03a2e5d28d758faab.zip
Apply upstream revision 3612ff6fcec0e3d1f2a598135fe12177c0419582:
Fix overflow check in BN_bn2dec() Fix an off by one error in the overflow check added by 07bed46 ("Check for errors in BN_bn2dec()"). This fixes a regression introduced in SA-16:26.openssl. Submitted by: jkim PR: 212921 Approved by: so
Notes
Notes: svn path=/releng/10.3/; revision=306336
-rw-r--r--UPDATING4
-rw-r--r--crypto/openssl/crypto/bn/bn_print.c5
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 7 insertions, 4 deletions
diff --git a/UPDATING b/UPDATING
index 8fc5c51f44e4..066d5e6ab867 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of
stable/10, and then rebuild without this option. The bootstrap process from
older version of current is a bit fragile.
+20160926 p9 FreeBSD-SA-16:26.openssl [revised]
+
+ Fix OpenSSL regression introduced in SA-16:26.
+
20160923 p8 FreeBSD-SA-16:26.openssl
Fix multiple OpenSSL vulnerabilitites.
diff --git a/crypto/openssl/crypto/bn/bn_print.c b/crypto/openssl/crypto/bn/bn_print.c
index 51e4f9e51117..0530e7dfd43f 100644
--- a/crypto/openssl/crypto/bn/bn_print.c
+++ b/crypto/openssl/crypto/bn/bn_print.c
@@ -141,14 +141,13 @@ char *BN_bn2dec(const BIGNUM *a)
if (BN_is_negative(t))
*p++ = '-';
- i = 0;
while (!BN_is_zero(t)) {
+ if (lp - bn_data >= bn_data_num)
+ goto err;
*lp = BN_div_word(t, BN_DEC_CONV);
if (*lp == (BN_ULONG)-1)
goto err;
lp++;
- if (lp - bn_data >= bn_data_num)
- goto err;
}
lp--;
/*
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 8b54e4445fe4..880d7402b7af 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.3"
-BRANCH="RELEASE-p8"
+BRANCH="RELEASE-p9"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi