aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacques Vidrine <nectar@FreeBSD.org>2002-08-05 16:28:58 +0000
committerJacques Vidrine <nectar@FreeBSD.org>2002-08-05 16:28:58 +0000
commit60bbc3a45088202f1321b7d469d7bbdb7caa6f19 (patch)
treefcb65158b786a7b8b3a5a22c226981687f710427
parent4e01f8427e1a5f50803770bcaad8ed480ee30711 (diff)
downloadsrc-60bbc3a45088202f1321b7d469d7bbdb7caa6f19.tar.gz
src-60bbc3a45088202f1321b7d469d7bbdb7caa6f19.zip
MFC src/crypto/openssl/crypto/asn1/asn1_lib.c rev 1.1.1.6:
Correct a bug in the ASN.1 decoder.
Notes
Notes: svn path=/releng/4.4/; revision=101389
-rw-r--r--UPDATING4
-rw-r--r--crypto/openssl/crypto/asn1/asn1_lib.c2
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 6 insertions, 2 deletions
diff --git a/UPDATING b/UPDATING
index 3cafae418140..44ea96eaef25 100644
--- a/UPDATING
+++ b/UPDATING
@@ -17,6 +17,10 @@ minimal number of processes, if possible, for that patch. For those
updates that don't have an advisory, or to be safe, you can do a full
build and install as described in the COMMON ITEMS section.
+20020805: p25
+ Correct a bug in the ASN.1 decoder which was introduced with
+ the recent OpenSSL update.
+
20020805: p24 FreeBSD-SA-02:37.kqueue
Registering an EVFILT_WRITE event on a pipe whose far end had
already been closed would cause a kernel panic.
diff --git a/crypto/openssl/crypto/asn1/asn1_lib.c b/crypto/openssl/crypto/asn1/asn1_lib.c
index 1fe3fbc1fa78..a3681c0e23c7 100644
--- a/crypto/openssl/crypto/asn1/asn1_lib.c
+++ b/crypto/openssl/crypto/asn1/asn1_lib.c
@@ -124,7 +124,7 @@ int ASN1_get_object(unsigned char **pp, long *plength, int *ptag, int *pclass,
(int)(omax+ *pp));
#endif
- if (*plength > (omax - (*pp - p)))
+ if (*plength > (omax - (p - *pp)))
{
ASN1err(ASN1_F_ASN1_GET_OBJECT,ASN1_R_TOO_LONG);
/* Set this so that even if things are not long enough
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 671c56c7f402..f76f913b862f 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="4.4"
-BRANCH="RELEASE-p24"
+BRANCH="RELEASE-p25"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"