10.3/releng-p9.diff

Index: UPDATING
===================================================================
--- UPDATING	(版本 306230)
+++ UPDATING	(版本 306336)
@@ -16,6 +16,10 @@
 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.
Index: crypto/openssl/crypto/bn/bn_print.c
===================================================================
--- crypto/openssl/crypto/bn/bn_print.c	(版本 306230)
+++ crypto/openssl/crypto/bn/bn_print.c	(版本 306336)
@@ -141,14 +141,13 @@
         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--;
         /*
Index: sys/conf/newvers.sh
===================================================================
--- sys/conf/newvers.sh	(版本 306230)
+++ sys/conf/newvers.sh	(版本 306336)
@@ -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