mozilla registry.dat parsing

Issue number:
Submitted by:
Reviewed by:

5 files changed, 34 insertions, 17 deletions

diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 3809ff3bc13c..05045768594b 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlsignaturehelper.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: mt $ $Date: 2004-07-22 10:34:22 $
+ *  last change: $Author: mmi $ $Date: 2004-07-23 03:00:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -155,11 +155,13 @@ bool XMLSignatureHelper::Init( const rtl::OUString& rTokenPath )
     }
     */
 
+/*
 #ifndef WNT
     // MT: HACK for testing
     if ( !aTokenPath.getLength() )
         aTokenPath = rtl::OUString::createFromAscii("/tmp/nss");
 #endif
+*/
 
     mxSecurityContext = mxSEInitializer->createSecurityContext( aTokenPath );
 
diff --git a/xmlsecurity/source/xmlsec/nss/makefile.mk b/xmlsecurity/source/xmlsec/nss/makefile.mk
index a52e6abf1893..6b7c76852d99 100644
--- a/xmlsecurity/source/xmlsec/nss/makefile.mk
+++ b/xmlsecurity/source/xmlsec/nss/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1.1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: mt $ $Date: 2004-07-12 13:15:21 $
+#   last change: $Author: mmi $ $Date: 2004-07-23 03:00:41 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -95,14 +95,12 @@ CFLAGS += -features=tmplife
 .IF "$(GUI)" == "WNT"
 .IF "$(DBG_LEVEL)" == "0"
 INCPRE += \
- -I$(MOZ_INC)$/xpcom \
 -I$(MOZ_INC)$/profile \
 -I$(MOZ_INC)$/string \
 -I$(MOZ_INC)$/embed_base
 CFLAGS +=   -GR- -W3 -Gy -MD -UDEBUG
 .ELSE
 INCPRE += \
- -I$(MOZ_INC)$/xpcom \
 -I$(MOZ_INC)$/profile \
 -I$(MOZ_INC)$/string \
 -I$(MOZ_INC)$/embed_base
@@ -111,8 +109,7 @@ CFLAGS += -Zi -GR- -W3 -Gy -MDd -UNDEBUG
 .ENDIF
 .IF "$(GUI)" == "UNX"
 INCPOST += \
-$(MOZ_INC)$/xpcom \
--I$(MOZ_INC)$/profile \
+$(MOZ_INC)$/profile \
 -I$(MOZ_INC)$/string \
 -I$(MOZ_INC)$/embed_base
 .IF "$(OS)" == "LINUX"
@@ -142,6 +139,7 @@ SOLARINC += \
 -I$(PRJ)$/source$/xmlsec
 
 SLOFILES = \
+    $(SLO)$/moz_profile.obj \
     $(SLO)$/securityenvironment_nssimpl.obj \
     $(SLO)$/xmlencryption_nssimpl.obj \
     $(SLO)$/xmlsecuritycontext_nssimpl.obj \
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index a4a58a994e49..0dfe8206a562 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: seinitializer_nssimpl.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mt $ $Date: 2004-07-21 14:31:25 $
+ *  last change: $Author: mmi $ $Date: 2004-07-23 03:00:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,10 +83,12 @@
 /*
  * header files needed for getCurrentProfilePath
  */
+/*
 #include "nsIServiceManager.h"
 #include "nsIProfileInternal.h"
 #include "nsString.h"
 #include "nsEmbedAPI.h"
+*/
 
 #include <sal/types.h>
 
@@ -123,6 +125,7 @@ using namespace com::sun::star;
 //      This is a bug, because any other component who will initialize the XPCOM afterward
 //      will always fail.
 //      This bug will be fixed when there is solution.
+#if 0
 static nsIServiceManager           *sServiceManager = nsnull;
 static nsIDirectoryServiceProvider *appFileLocProvider = nsnull;
 static NS_DEFINE_CID(kProfileCID, NS_PROFILE_CID);
@@ -201,6 +204,10 @@ char* getCurrentProfilePath( )
  * get the current user profile (end)
  */
 
+#endif
+
+bool getMozillaCurrentProfile(rtl::OUString& profilePath);
+
 SEInitializer_NssImpl::SEInitializer_NssImpl(
     const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > &rxMSF)
     :mxMSF( rxMSF )
@@ -227,6 +234,12 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
     }
     else
     {
+        if (!getMozillaCurrentProfile((rtl::OUString&)sCertDir))
+        {
+            return NULL;
+        }
+
+        /*
         char *pCurrentProfilePath = getCurrentProfilePath();
 
         if (pCurrentProfilePath == NULL)
@@ -238,6 +251,7 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
             sCertDir = rtl::OString(pCurrentProfilePath);
             free(pCurrentProfilePath);
         }
+        */
     }
 
     /* Initialize NSPR and NSS */
diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk
index 423d95167ab0..1780605e01de 100644
--- a/xmlsecurity/util/makefile.mk
+++ b/xmlsecurity/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.9 $
+#   $Revision: 1.10 $
 #
-#   last change: $Author: mt $ $Date: 2004-07-21 14:34:06 $
+#   last change: $Author: mmi $ $Date: 2004-07-23 03:00:42 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -121,12 +121,15 @@ SHL2STDLIBS +=			\
     $(SALLIB)			\
     $(CPPULIB)			\
     $(CPPUHELPERLIB)	\
+    $(OSLLIB)	\
+    $(SALLIB)	\
+    $(UNOTOOLSLIB)	    \
     $(SVLLIB)			\
     $(TOOLSLIB)			\
     $(COMPHELPERLIB)	\
     $(CPPUHELPERLIB)	\
     $(XMLOFFLIB)
-    
+
 .IF "$(GUI)"=="WNT"
 .IF "$(CRYPTO_ENGINE)" == "mscrypto"
 SHL2STDLIBS+= "ixml2.lib" "xmlsec.lib" "xmlsec-mscrypto.lib" "crypt32.lib" "advapi32.lib"
diff --git a/xmlsecurity/util/target.pmk b/xmlsecurity/util/target.pmk
index cd44f80fc067..fde65a6600f5 100644
--- a/xmlsecurity/util/target.pmk
+++ b/xmlsecurity/util/target.pmk
@@ -3,9 +3,9 @@
 #
 #   $RCSfile: target.pmk,v $
 #
-#   $Revision: 1.1.1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: mt $ $Date: 2004-07-12 13:15:31 $
+#   last change: $Author: mmi $ $Date: 2004-07-23 03:00:43 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -61,8 +61,8 @@
 #
 #*************************************************************************
 .IF "$(GUI)" == "WNT"
-CRYPTO_ENGINE = mscrypto
-#CRYPTO_ENGINE = nss
+#CRYPTO_ENGINE = mscrypto
+CRYPTO_ENGINE = nss
 .ELSE
 CRYPTO_ENGINE = nss
 .ENDIF