CVS commit: src/crypto/external/bsd/openssl/dist/crypto/asn1

[S.P.Zeidler]

Module Name:src
Committed By:   spz
Date:   Sun Aug 10 08:27:42 UTC 2014

Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/asn1: tasn_enc.c

Log Message:
merge accident, fixed


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c:1.2 src/crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c:1.3
--- src/crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c:1.2	Sun Aug 10 08:07:48 2014
+++ src/crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c	Sun Aug 10 08:27:42 2014
@@ -463,7 +463,6 @@ static int asn1_set_seq_out(STACK_OF(ASN
 }
 			}
 		}
-		}
 	/* If not sorting just output each item */
 	if (!do_sort)
 		{

CVS commit: src/crypto/external/bsd/openssl/dist/crypto/asn1

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Tue Feb 28 17:23:58 UTC 2012

Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/asn1: asn_mime.c

Log Message:
apply upstream rev.22146: Tolerate bad MIME headers in parser.
avoids possible NULL dereference (CVE-2006-7248)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c:1.1.1.1 src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c:1.1.1.1	Sun Jul 19 23:02:52 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c	Tue Feb 28 17:23:58 2012
@@ -858,6 +858,10 @@ static int mime_hdr_addparam(MIME_HEADER
 static int mime_hdr_cmp(const MIME_HEADER * const *a,
 			const MIME_HEADER * const *b)
 {
+	if ((*a)-name == NULL || (*b)-name == NULL)
+		return (*a)-name - (*b)-name  0 ? -1 :
+			(*a)-name - (*b)-name  0 ? 1 : 0;
+
 	return(strcmp((*a)-name, (*b)-name));
 }