summaryrefslogtreecommitdiff
path: root/camel
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-02-26 17:41:04 +0000
committerMilan Crha <mcrha@src.gnome.org>2009-02-26 17:41:04 +0000
commit95bdfda7df577d06561c1d6f9c20eb2df40bb9ac (patch)
tree17b1ede56b8ad07873adde700076f5eb81794025 /camel
parent24cb0f1c0f6dc998adec9ac5aa86ad81a2d8e29f (diff)
downloadevolution-data-server-95bdfda7df577d06561c1d6f9c20eb2df40bb9ac.tar.gz
Check also value of the NSS_VPATCH.
2009-02-26 Milan Crha <mcrha@redhat.com> * camel-smime-context.c: (nss_error_to_string): Check also value of the NSS_VPATCH. svn path=/trunk/; revision=10104
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog5
-rw-r--r--camel/camel-smime-context.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 5d08323b6..d7e422d7e 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-26 Milan Crha <mcrha@redhat.com>
+
+ * camel-smime-context.c: (nss_error_to_string):
+ Check also value of the NSS_VPATCH.
+
2009-02-25 Milan Crha <mcrha@redhat.com>
* camel-smime-context.c: (nss_error_to_string):
diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c
index 2413e40f6..1e70686aa 100644
--- a/camel/camel-smime-context.c
+++ b/camel/camel-smime-context.c
@@ -382,7 +382,7 @@ nss_error_to_string (long errorcode)
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.")
- #if defined(NSS_VMAJOR) && defined(NSS_VMINOR) && (NSS_VMAJOR > 3 || (NSS_VMAJOR == 3 && NSS_VMINOR >= 12))
+ #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")
cs (SEC_ERROR_INVALID_POLICY_MAPPING, "Policy mapping contains anypolicy")
cs (SEC_ERROR_POLICY_VALIDATION_FAILED, "Cert chain fails policy validation")