ooo-build r13610 - in trunk: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Mon Aug 18 14:43:54 2008
New Revision: 13610
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13610&view=rev

Log:
2008-08-18  Petr Mladek  <pmladek suse cz>

	* patches/dev300/xmlsecurity-verify-usages.diff, patches/dev300/apply:
	  port for dev300



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/xmlsecurity-verify-usages.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Aug 18 14:43:54 2008
@@ -453,7 +453,7 @@
 # find locked certs, fix by Jacob Berkman <jberkman novell com>
 libxmlsec-findcerts.diff, i#76870, pmladek
 # allow other types of signing certs, fix by Jacob Berkman <jberkman novell com>
-#FIXME src680: xmlsecurity-verify-usages.diff, i#76871, pmladek
+xmlsecurity-verify-usages.diff, i#76871, pmladek
 
 # fix that allows OOo to work with a standard (unpatched) libjpeg,
 jpegc.c.diff, i#80674, n#272574, flr

Modified: trunk/patches/dev300/xmlsecurity-verify-usages.diff
==============================================================================
--- trunk/patches/dev300/xmlsecurity-verify-usages.diff	(original)
+++ trunk/patches/dev300/xmlsecurity-verify-usages.diff	Mon Aug 18 14:43:54 2008
@@ -1,19 +1,11 @@
---- xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx~	2007-03-15 15:37:47.000000000 -0400
-+++ xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx	2007-03-19 11:14:07.000000000 -0400
-@@ -796,10 +828,12 @@ sal_Int32 SecurityEnvironment_NssImpl ::
-             //The expression  if ( flags & CERTDB_TRUSTED ) fails. This occurred with openssl 
-             //generated certificates, when the trust settings of the root certificate had only the 
-             //item "This certificate can identify web sites" checked.
--            if (usage & certificateUsageEmailSigner
--                || usage & certificateUsageEmailRecipient
--                || usage & certificateUsageSSLCA
--                /*|| usage & certificateUsageSSLClient*/)
-+	    if (usage & (certificateUsageEmailSigner
-+			 | certificateUsageEmailRecipient
-+			 | certificateUsageSSLCA
-+			 | certificateUsageProtectedObjectSigner
-+			 | certificateUsageObjectSigner
-+			 /* | certificateUsageSSLClient*/))
-                 validity = csss::CertificateValidity::VALID;
-             else
-                 validity = csss::CertificateValidity::INVALID;
+--- xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx.old	2008-04-11 02:37:54.000000000 +0200
++++ xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx	2008-08-18 16:12:27.000000000 +0200
+@@ -826,6 +826,8 @@ sal_Int32 SecurityEnvironment_NssImpl ::
+                 || usage & certificateUsageSSLCA
+                 || usage & certificateUsageSSLServer
+                 || usage & certificateUsageSSLClient 
++                || usage & certificateUsageProtectedObjectSigner
++                || usage & certificateUsageObjectSigner
+                 // || usage & certificateUsageUserCertImport
+                 // || usage & certificateUsageVerifyCA
+                 || usage & certificateUsageStatusResponder )