ailiopoulos/mutt
1
0
Fork 0
forked from rpm/mutt
Code Pull Requests Activity

Accepting request 20196 from server:mail

Browse Source 
Copy from server:mail/mutt based on submit request 20196 from user WernerFink

OBS-URL: https://build.opensuse.org/request/show/20196
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutt?expand=0&rev=17
This commit is contained in:
OBS User autobuild 2009-09-10 11:14:16 +00:00 committed by Git OBS Bridge
parent 655af6d587
commit 26626adcca
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mutt-1.5.20-bnc537141.dif Normal file
View File

@ -0,0 +1,23 @@
--- mutt_ssl.c
+++ mutt_ssl.c 2009-09-09 14:13:19.600635937 +0200
@@ -681,7 +681,8 @@ static int check_host (X509 *x509cert, c
subj_alt_name = sk_GENERAL_NAME_value(subj_alt_names, i);
if (subj_alt_name->type == GEN_DNS)
{
- if ((match_found = hostname_match(hostname_ascii,
+ if (mutt_strlen(subj_alt_name->d.ia5->data) == subj_alt_name->d.ia5->length &&
+ (match_found = hostname_match(hostname_ascii,
(char *)(subj_alt_name->d.ia5->data))))
{
break;
@@ -711,7 +712,9 @@ static int check_host (X509 *x509cert, c
strfcpy (err, _("cannot get certificate common name"), errlen);
goto out;
}
- match_found = hostname_match(hostname_ascii, buf);
+ if (mutt_strlen(buf) == bufsize - 1) {
+ match_found = hostname_match(hostname_ascii, buf);
+ }
}
if (!match_found)

5
mutt.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Sep 9 13:43:58 CEST 2009 - werner@suse.de
- Fix incorrectly handling of \0 character in SSL certificate (bnc#537141)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 15 13:46:07 CEST 2009 - werner@suse.de Wed Jul 15 13:46:07 CEST 2009 - werner@suse.de

4
mutt.spec
View File

@ -32,7 +32,7 @@ Requires: smtp_daemon
#Requires: desktop-data-SuSE #Requires: desktop-data-SuSE
AutoReqProv: on AutoReqProv: on
Version: 1.5.20 Version: 1.5.20
Release: 2 Release: 3
Summary: Mail Program Summary: Mail Program
# ftp://ftp.mutt.org/mutt/devel/ # ftp://ftp.mutt.org/mutt/devel/
Source0: %name-%version.tar.bz2 Source0: %name-%version.tar.bz2
@ -54,6 +54,7 @@ Patch6: patch-%version.sidebar.20090619.txt.bz2
Patch7: mutt-1.5.20.sidebar-fix.dif Patch7: mutt-1.5.20.sidebar-fix.dif
Patch8: mutt-1.5.19-opennfs.dif Patch8: mutt-1.5.19-opennfs.dif
Patch9: mutt-1.5.20-gpgme_set_locale.patch Patch9: mutt-1.5.20-gpgme_set_locale.patch
Patch10: mutt-1.5.20-bnc537141.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir %{_sysconfdir} %global _sysconfdir %{_sysconfdir}
@ -81,6 +82,7 @@ Authors:
%patch7 -p0 %patch7 -p0
%patch8 -p0 %patch8 -p0
%patch9 -p1 %patch9 -p1
%patch10 -p0
cp doc/Muttrc Muttrc.SuSE cp doc/Muttrc Muttrc.SuSE
cp %{S:2} . cp %{S:2} .