diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2009-03-08 20:58:50 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2009-03-08 20:58:50 +0000 |
| commit | f47397e93900d5c84e7e114c1a449e6d61abe531 (patch) | |
| tree | c95763cc174c8c813a8f7b6a11f62b2828185a2c /gnome-extra/evolution-data-server/files | |
| parent | Drop KDE 4.2.0 (diff) | |
| download | gentoo-2-f47397e93900d5c84e7e114c1a449e6d61abe531.tar.gz gentoo-2-f47397e93900d5c84e7e114c1a449e6d61abe531.tar.bz2 gentoo-2-f47397e93900d5c84e7e114c1a449e6d61abe531.zip | |
And fix the 2.22 version as well
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra/evolution-data-server/files')
| -rw-r--r-- | gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-CVE-2009-0547.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-CVE-2009-0547.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-CVE-2009-0547.patch index d7c1f6444879..7ce27faf4723 100644 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-CVE-2009-0547.patch +++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-CVE-2009-0547.patch @@ -59,13 +59,13 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2. - PORT_FreeArena(poolp, PR_FALSE); - poolp = NULL; + if (extstream == NULL) { -+ set_nss_error (ex, _("Digests missing from enveloped data")); ++ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Digests missing from enveloped data")); + goto fail; } - + + if ((poolp = PORT_NewArena(1024)) == NULL) { -+ set_nss_error (ex, g_strerror (ENOMEM)); ++ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, g_strerror (ENOMEM)); + goto fail; + } + @@ -73,7 +73,7 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2. + + digcx = NSS_CMSDigestContext_StartMultiple(digestalgs); + if (digcx == NULL) { -+ set_nss_error (ex, _("Cannot calculate digests")); ++ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests")); + goto fail; + } + @@ -83,18 +83,18 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2. + camel_object_unref(mem); + + if (NSS_CMSDigestContext_FinishMultiple(digcx, poolp, &digests) != SECSuccess) { -+ set_nss_error (ex, _("Cannot calculate digests")); ++ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests")); + goto fail; + } + + for (which_digest = 0; digests[which_digest] != NULL; which_digest++) { + SECOidData *digest_alg = SECOID_FindOID (&digestalgs[which_digest]->algorithm); + if (digest_alg == NULL) { -+ set_nss_error (ex, _("Cannot set message digests")); ++ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests")); + goto fail; + } + if (NSS_CMSSignedData_SetDigestValue (sigd, digest_alg->offset, digests[which_digest]) != SECSuccess) { -+ set_nss_error (ex, _("Cannot set message digests")); ++ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests")); + goto fail; + } + } |