Revise SA-16:26 to fix a regression.

svn path=/head/; revision=49429
2016-09-26 08:28:48 +00:00 · 2016-09-26 08:28:48 +00:00 · 7ad136b3b5 · 2020-12-08 03:00:23 +00:00
commit 7ad136b3b5
parent b46858554b
3 changed files with 72 additions and 26 deletions
--- a/share/security/patches/SA-16:26/openssl-fix.patch
+++ b/share/security/patches/SA-16:26/openssl-fix.patch
@ -0,0 +1,19 @@
+--- crypto/openssl/crypto/bn/bn_print.c.orig
+++ crypto/openssl/crypto/bn/bn_print.c
+@@ -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--;
+         /*
--- a/share/security/patches/SA-16:26/openssl-fix.patch.asc
+++ b/share/security/patches/SA-16:26/openssl-fix.patch.asc
@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.13 (FreeBSD)
+
+iQIcBAABCgAGBQJX6Nu7AAoJEO1n7NZdz2rnZo8QALAnB2tI1lhZLUayhrCd/HAU
+MNxSsqcP55dYYE6b9a6k8HcN1MiLXbxUt/KBT1wtGOvs6SrpqOVvzjDaEqLtufjx
+mAiRqKYulWbAdl8RJSESJY17LdyBN68crSQ1AH7t7jlyCjKOq3pBffVuEuiCLYph
+OhLfz8/7HS2vZNxPtnEv2RJ+Vwwy9uc6pkqGwyMz4xipVrUOuorV84dJ+DIdLbOT
+wk288iZcc519I1DAw61t+cMTG+7xYZW5pa4jTRUY9WMSSeGfW0RBaD/m795aK2FQ
+L8226nawoB6Lp6r3L1EU6592/nd6p4Igvgj+s9dqy2kWzs/NZbyxOm4m7Ymz/7DH
+r/j8RK0o8Asm9F2Mtg/PWynKgo3XInbEudwpMP2jGxMhx8KOlMc01lM4i5hAdwmm
+iGKpcEzwTVTVCdwjbGhJV2YMhurBAjGJv4P6fn/xTpEpjd16MSirP47ryYYcIFL3
+NOguwS/5Hj86HMLx3bDfvp11D9mttlPU0FRYfpVUqFh9zn640BqxkD81ra1L6cKP
+d5Lt60FAM2ro/xqEPDh12po/qBmk9cWP7NMNh+ASe0SVyraCwZAbLN4gKHH91EdL
+GA5h1yDrse4iUm7lBRwv4dKgJYSNJXoWfyDRpSbBA3O3z4CV0IGNLFNxZoY3JCpd
+VRvG2kKCBbiiyQ/PcFNZ
+=SXHG
+-----END PGP SIGNATURE-----