diff options
| author | Renato Botelho <renato@netgate.com> | 2016-09-26 09:27:17 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-09-26 09:27:17 -0300 |
| commit | 2347f0a36657f63396a18192e845631b6df24672 (patch) | |
| tree | 440c1bd87471a0e2254eb91d2445b93e5ca0e3b7 | |
| parent | 7bc30750602dd1adf70107eb72862b3594fb5db7 (diff) | |
| parent | 732e3790c641745d1af66fb12949ce9727cc2923 (diff) | |
| download | FreeBSD-src-2347f0a36657f63396a18192e845631b6df24672.zip FreeBSD-src-2347f0a36657f63396a18192e845631b6df24672.tar.gz | |
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3
| -rw-r--r-- | UPDATING | 4 | ||||
| -rw-r--r-- | crypto/openssl/crypto/bn/bn_print.c | 5 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
3 files changed, 7 insertions, 4 deletions
@@ -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 51e4f9e..0530e7df 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 8b54e44..880d740 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 |
