summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon L. B. Nielsen <simon@FreeBSD.org>2007-11-29 16:07:53 +0000
committerSimon L. B. Nielsen <simon@FreeBSD.org>2007-11-29 16:07:53 +0000
commit1441f4fb5cbfb854370110a0a6eb9527f6512f68 (patch)
treea7551eacb21ddeff76718bbdc29ca2f5bb1ab69a
parentbe5f6c38369469a4ee4660c375cf04c87e8f04c6 (diff)
downloadsrc-test-1441f4fb5cbfb854370110a0a6eb9527f6512f68.tar.gz
src-test-1441f4fb5cbfb854370110a0a6eb9527f6512f68.zip
Notes
-rw-r--r--UPDATING3
-rw-r--r--sys/conf/newvers.sh2
-rw-r--r--sys/dev/random/yarrow.c1
3 files changed, 5 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index 7c9be7abeaf94..220a5f2bd2692 100644
--- a/UPDATING
+++ b/UPDATING
@@ -8,6 +8,9 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running
portupgrade.
+20071129: p9 FreeBSD-SA-07:09.random
+ Correct a random value disclosure in random(4).
+
20071003: p8 FreeBSD-SA-07:08.openssl
Correct a buffer overflow in OpenSSL SSL_get_shared_ciphers().
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 2b6280540d429..707c4b42f391a 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="6.2"
-BRANCH="RELEASE-p8"
+BRANCH="RELEASE-p9"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
diff --git a/sys/dev/random/yarrow.c b/sys/dev/random/yarrow.c
index ab10b210b7b4d..b10bd0d0ffcf5 100644
--- a/sys/dev/random/yarrow.c
+++ b/sys/dev/random/yarrow.c
@@ -298,6 +298,7 @@ random_yarrow_read(void *buf, int count)
random_state.outputblocks = 0;
}
retval += (int)tomove;
+ cur = 0;
}
}
else {