diff options
| author | tron <tron@pkgsrc.org> | 2012-03-06 10:29:29 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2012-03-06 10:29:29 +0000 |
| commit | 76c7b93a9ec4d2b259b82259584ced0cde0f6779 (patch) | |
| tree | f5a71f17360c0d4ec1ab4ff3433d65ab017b9eb3 | |
| parent | 9066f164407b53f281ec1a08b5115ce65d8f0431 (diff) | |
| download | pkgsrc-76c7b93a9ec4d2b259b82259584ced0cde0f6779.tar.gz | |
Pullup ticket #3698 - requested by pettai
security/openssl: security patch
Revisions pulled up:
- security/openssl/Makefile 1.162
- security/openssl/distinfo 1.85
- security/openssl/patches/patch-asn_mime.c 1.1
---
Module Name: pkgsrc
Committed By: pettai
Date: Mon Mar 5 00:26:55 UTC 2012
Modified Files:
pkgsrc/security/openssl: Makefile distinfo
Added Files:
pkgsrc/security/openssl/patches: patch-asn_mime.c
Log Message:
Add fix for CVE-2006-7250
| -rw-r--r-- | security/openssl/Makefile | 3 | ||||
| -rw-r--r-- | security/openssl/distinfo | 3 | ||||
| -rw-r--r-- | security/openssl/patches/patch-asn_mime.c | 17 |
3 files changed, 21 insertions, 2 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index c42ee319655..85ca443b206 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.159.2.1 2012/01/19 06:11:48 sbd Exp $ +# $NetBSD: Makefile,v 1.159.2.2 2012/03/06 10:29:29 tron Exp $ OPENSSL_SNAPSHOT?= # empty OPENSSL_STABLE?= # empty @@ -22,6 +22,7 @@ MASTER_SITES= ftp://ftp.openssl.org/snapshot/ .endif SVR4_PKGNAME= ossl +PKGREVISION= 1 CATEGORIES= security MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.openssl.org/ diff --git a/security/openssl/distinfo b/security/openssl/distinfo index 5ffa428afd0..da10dd6019d 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.83.2.1 2012/01/19 06:11:48 sbd Exp $ +$NetBSD: distinfo,v 1.83.2.2 2012/03/06 10:29:29 tron Exp $ SHA1 (openssl-0.9.8t.tar.gz) = 42e2ba06cc859d61f645915c9a30326eda371a5e RMD160 (openssl-0.9.8t.tar.gz) = 8d5a32ebc94c578021bce519f92b5d31743d3e47 @@ -11,3 +11,4 @@ SHA1 (patch-af) = 2610930b6b06397fa2e3955b3244c02193f5b7a6 SHA1 (patch-ag) = 5f12c72b85e4b6c6a79dfcf87055e9e029fbd8c8 SHA1 (patch-ak) = 049250b9bd42e6f155145703135dab39a7ec17e0 SHA1 (patch-al) = 076a606352bdeaeea1cc64f16be2ac1325882302 +SHA1 (patch-asn_mime.c) = 45c25660b03687a014e54a24343f775e0e6b9b71 diff --git a/security/openssl/patches/patch-asn_mime.c b/security/openssl/patches/patch-asn_mime.c new file mode 100644 index 00000000000..58e85f5b5bb --- /dev/null +++ b/security/openssl/patches/patch-asn_mime.c @@ -0,0 +1,17 @@ +$NetBSD: patch-asn_mime.c,v 1.1.2.2 2012/03/06 10:29:30 tron Exp $ + +http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-7250 + +--- crypto/asn1/asn_mime.c.orig 2012-03-05 00:08:44.000000000 +0000 ++++ crypto/asn1/asn_mime.c +@@ -790,6 +790,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)); + } + |