- Revise patch for RH bug #235290 to not break string freeze.
This commit is contained in:
parent
ec880f9f66
commit
1d8712e370
@ -1,5 +1,5 @@
|
|||||||
--- evolution-data-server-1.10.1/camel/providers/pop3/camel-pop3-store.c.apop-auth-vulnerability 2007-04-09 08:42:37.000000000 -0400
|
--- evolution-data-server-1.10.1/camel/providers/pop3/camel-pop3-store.c.apop-auth-vulnerability 2007-04-09 08:42:37.000000000 -0400
|
||||||
+++ evolution-data-server-1.10.1/camel/providers/pop3/camel-pop3-store.c 2007-04-24 16:12:28.000000000 -0400
|
+++ evolution-data-server-1.10.1/camel/providers/pop3/camel-pop3-store.c 2007-04-30 16:42:12.000000000 -0400
|
||||||
@@ -34,6 +34,7 @@
|
@@ -34,6 +34,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
@ -8,25 +8,26 @@
|
|||||||
|
|
||||||
#include "camel-operation.h"
|
#include "camel-operation.h"
|
||||||
|
|
||||||
@@ -489,6 +490,21 @@
|
@@ -489,7 +490,21 @@
|
||||||
} else if (strcmp(service->url->authmech, "+APOP") == 0 && store->engine->apop) {
|
} else if (strcmp(service->url->authmech, "+APOP") == 0 && store->engine->apop) {
|
||||||
char *secret, md5asc[33], *d;
|
char *secret, md5asc[33], *d;
|
||||||
unsigned char md5sum[16], *s;
|
unsigned char md5sum[16], *s;
|
||||||
|
-
|
||||||
+
|
+
|
||||||
+ d = store->engine->apop;
|
+ d = store->engine->apop;
|
||||||
+
|
+
|
||||||
+ while (*d != '\0') {
|
+ while (*d != '\0') {
|
||||||
+ if (!isascii((int)*d)) {
|
+ if (!isascii((int)*d)) {
|
||||||
|
+
|
||||||
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
|
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
|
||||||
+ _("Unable to connect to POP server %s: "
|
+ _("Unable to connect to POP server %s: "),
|
||||||
+ "Invalid APOP ID received. Impersonation attack "
|
|
||||||
+ "suspected. Please contact your admin."),
|
|
||||||
+ CAMEL_SERVICE (store)->url->host);
|
+ CAMEL_SERVICE (store)->url->host);
|
||||||
+
|
+
|
||||||
+ return FALSE;
|
+ return FALSE;
|
||||||
+ }
|
+ }
|
||||||
+ d++;
|
+ d++;
|
||||||
+ }
|
+ }
|
||||||
|
+
|
||||||
secret = g_alloca(strlen(store->engine->apop)+strlen(service->url->passwd)+1);
|
secret = g_alloca(strlen(store->engine->apop)+strlen(service->url->passwd)+1);
|
||||||
sprintf(secret, "%s%s", store->engine->apop, service->url->passwd);
|
sprintf(secret, "%s%s", store->engine->apop, service->url->passwd);
|
||||||
|
md5_get_digest(secret, strlen (secret), md5sum);
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
Name: evolution-data-server
|
Name: evolution-data-server
|
||||||
Version: 1.10.1
|
Version: 1.10.1
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
License: LGPL
|
License: LGPL
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Summary: Backend data server for Evolution
|
Summary: Backend data server for Evolution
|
||||||
@ -392,6 +392,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
|
%{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Apr 30 2007 Matthew Barnes <mbarnes@redhat.com> - 1.10.1-3.fc7
|
||||||
|
- Revise patch for RH bug #235290 to not break string freeze.
|
||||||
|
|
||||||
* Tue Apr 24 2007 Matthew Barnes <mbarnes@redhat.com> - 1.10.1-2.fc7
|
* Tue Apr 24 2007 Matthew Barnes <mbarnes@redhat.com> - 1.10.1-2.fc7
|
||||||
- Add patch for RH bug #235290 (APOP authentication vulnerability).
|
- Add patch for RH bug #235290 (APOP authentication vulnerability).
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user