summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-02-03 18:01:26 -0200
committerRenato Botelho <renato@netgate.com>2016-02-03 18:01:26 -0200
commitaf0758169e63a4e7f6024c241d9254a8bc09908d (patch)
treea31903fc62c875e8d23a391beb8ae57ed0092c45 /release
parent79f27b5150f7b79a6f1bcd30e9233f1abb9c3e36 (diff)
parent6114d518f71115abacc5d610c4d668ef6e0b2f37 (diff)
downloadFreeBSD-src-af0758169e63a4e7f6024c241d9254a8bc09908d.zip
FreeBSD-src-af0758169e63a4e7f6024c241d9254a8bc09908d.tar.gz
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'release')
-rw-r--r--release/amd64/mkisoimages-uefi.sh2
-rw-r--r--release/doc/share/xml/security.xml8
2 files changed, 9 insertions, 1 deletions
diff --git a/release/amd64/mkisoimages-uefi.sh b/release/amd64/mkisoimages-uefi.sh
index 2b89d89..9526ad7 100644
--- a/release/amd64/mkisoimages-uefi.sh
+++ b/release/amd64/mkisoimages-uefi.sh
@@ -28,7 +28,7 @@ if [ "x$1" = "x-b" ]; then
bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
# Make EFI system partition (should be done with makefs in the future)
- dd if=/dev/zero of=efiboot.img bs=4k count=100
+ dd if=/dev/zero of=efiboot.img bs=4k count=200
device=`mdconfig -a -t vnode -f efiboot.img`
newfs_msdos -F 12 -m 0xf8 /dev/$device
mkdir efi
diff --git a/release/doc/share/xml/security.xml b/release/doc/share/xml/security.xml
index e37b089..f1c4249 100644
--- a/release/doc/share/xml/security.xml
+++ b/release/doc/share/xml/security.xml
@@ -122,6 +122,14 @@
<entry><para>&man.issetugid.2; system call
vulnerability.</para></entry>
</row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-16:11.openssl.asc">FreeBSD-SA-16:11.openssl</link></entry>
+ <entry>30&nbsp;January&nbsp;2016</entry>
+ <entry><para>SSLv2 cipher suite downgrade
+ vulnerability.</para></entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
OpenPOWER on IntegriCloud