head 1.4; access; symbols pkgsrc-2019Q3:1.3.0.74 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.72 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.70 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.68 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.66 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.64 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.62 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.60 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.58 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.54 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.52 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.50 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.48 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.46 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.44 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.42 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.40 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.38 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.36 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.34 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.32 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.30 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.28 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.26 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.24 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.22 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.20 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.18 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.16 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.14 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.12 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.10 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.8 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.6 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.4 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.2 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.2.0.14 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.12 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.10 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.8 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.6 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.4 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.2 pkgsrc-2009Q1-base:1.2; locks; strict; comment @# @; 1.4 date 2019.10.30.17.26.50; author nia; state dead; branches; next 1.3; commitid DSHEjrLYlXqbOUIB; 1.3 date 2010.11.24.20.19.44; author drochner; state Exp; branches; next 1.2; 1.2 date 2009.03.19.12.02.09; author drochner; state Exp; branches; next 1.1; 1.1 date 2009.02.17.11.01.43; author drochner; state Exp; branches; next ; desc @@ 1.4 log @evolution: Update to 3.34.1 Switched to GTK3, etc. @ text @$NetBSD: patch-bd,v 1.3 2010/11/24 20:19:44 drochner Exp $ --- camel/camel-smime-context.c.orig 2010-09-21 06:20:59.000000000 +0000 +++ camel/camel-smime-context.c @@@@ -269,8 +269,10 @@@@ nss_error_to_string (glong errorcode) cs (SEC_ERROR_CRL_ALREADY_EXISTS, "CRL already exists.") cs (SEC_ERROR_NOT_INITIALIZED, "NSS is not initialized.") cs (SEC_ERROR_TOKEN_NOT_LOGGED_IN, "The operation failed because the PKCS#11 token is not logged in.") +#if defined(NSS_VMAJOR) && defined(NSS_VMINOR) && defined(NSS_VPATCH) && (NSS_VMAJOR > 3 || (NSS_VMAJOR == 3 && NSS_VMINOR > 11) || (NSS_VMAJOR == 3 && NSS_VMINOR == 11 && NSS_VPATCH >= 6)) cs (SEC_ERROR_OCSP_RESPONDER_CERT_INVALID, "Configured OCSP responder's certificate is invalid.") cs (SEC_ERROR_OCSP_BAD_SIGNATURE, "OCSP response has an invalid signature.") +#endif #if defined (NSS_VMAJOR) && defined (NSS_VMINOR) && defined (NSS_VPATCH) && (NSS_VMAJOR > 3 || (NSS_VMAJOR == 3 && NSS_VMINOR > 12) || (NSS_VMAJOR == 3 && NSS_VMINOR == 12 && NSS_VPATCH >= 2)) cs (SEC_ERROR_OUT_OF_SEARCH_LIMITS, "Cert validation search is out of search limits") @ 1.3 log @update to 2.32.1 This switches to the gnome-2.32 release branch. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @update to 2.26.0 This switches to the gnome-2.26 release branch @ text @d3 1 a3 1 --- camel/camel-smime-context.c.orig 2009-03-17 20:28:40.000000000 +0100 d5 1 a5 1 @@@@ -380,8 +380,10 @@@@ nss_error_to_string (long errorcode) d14 1 a14 1 #if defined(NSS_VMAJOR) && defined(NSS_VMINOR) && defined(NSS_VPATCH) && (NSS_VMAJOR > 3 || (NSS_VMAJOR == 3 && NSS_VMINOR > 12) || (NSS_VMAJOR == 3 && NSS_VMINOR == 12 && NSS_VPATCH >= 2)) @ 1.1 log @add a patch from gnome bugzilla#564465 to fix possible signature spoofing with s/mime mails (CVE-2009-0547) ride on last night's PKGREVISION bump @ text @d3 1 a3 1 --- camel/camel-smime-context.c.orig 2008-10-13 10:07:53.000000000 +0200 d5 8 a12 5 @@@@ -40,6 +40,7 @@@@ #include #include #include +#include d14 2 a15 34 #include @@@@ -545,6 +546,11 @@@@ sm_verify_cmsg(CamelCipherContext *conte /* need to build digests of the content */ if (!NSS_CMSSignedData_HasDigests(sigd)) { + camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests")); + goto fail; + } else { + int which_digest; + if (extstream == NULL) { camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Digests missing from enveloped data")); goto fail; @@@@ -573,9 +579,16 @@@@ sm_verify_cmsg(CamelCipherContext *conte goto fail; } - if (NSS_CMSSignedData_SetDigests(sigd, digestalgs, digests) != SECSuccess) { - camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message 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) { + 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) { + camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests")); + goto fail; + } } PORT_FreeArena(poolp, PR_FALSE); @