From 61dd1203a50927a532baf8d0cb3573386395d2ab Mon Sep 17 00:00:00 2001
From: Malte Timmermann <mt@openoffice.org>
Date: Wed, 21 Jul 2004 13:34:06 +0000
Subject: #i21596# Digital Signatutres...

---
 xmlsecurity/source/helper/xmlsignaturehelper.cxx        | 16 +++++++++-------
 xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx |  6 ++++--
 xmlsecurity/util/makefile.mk                            |  8 ++++----
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 2da4b03f9eda..c0f05769ad9d 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlsignaturehelper.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: mmi $ $Date: 2004-07-19 07:36:27 $
+ *  last change: $Author: mt $ $Date: 2004-07-21 14:31:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -111,9 +111,11 @@ bool XMLSignatureHelper::Init( const rtl::OUString& rTokenPath )
 
     ImplCreateSEInitializer();
 
+    rtl::OUString aTokenPath = rTokenPath;
+
+
     //MM : search for the default profile
     /*
-    rtl::OUString tokenPath = rTokenPath;
 
     if( tokenPath.getLength() == 0 )
     {
@@ -151,15 +153,15 @@ bool XMLSignatureHelper::Init( const rtl::OUString& rTokenPath )
             }
         }
     }
+    */
 
 #ifndef WNT
     // MT: HACK for testing
-    if ( !tokenPath.getLength() )
-        tokenPath = rtl::OUString::createFromAscii("/tmp/nss");
+    if ( !aTokenPath.getLength() )
+        aTokenPath = rtl::OUString::createFromAscii("/tmp/nss");
 #endif
-    */
 
-    mxSecurityContext = mxSEInitializer->createSecurityContext( rTokenPath );
+    mxSecurityContext = mxSEInitializer->createSecurityContext( aTokenPath );
 
     return mxSecurityContext.is();
 }
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index 8e755c238993..a4a58a994e49 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.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mmi $ $Date: 2004-07-19 10:09:14 $
+ *  last change: $Author: mt $ $Date: 2004-07-21 14:31:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -129,6 +129,7 @@ static NS_DEFINE_CID(kProfileCID, NS_PROFILE_CID);
 
 char* getCurrentProfilePath( )
 {
+/*
         nsCOMPtr<nsILocalFile> binDir;
 
         // Note: if getenv() returns NULL, mozilla will default to using MOZILLA_FIVE_HOME in the NS_InitXPCOM2()
@@ -191,6 +192,7 @@ char* getCurrentProfilePath( )
     //      one program
     //NS_RELEASE(sServiceManager);
     //NS_ShutdownXPCOM(sServiceManager);
+    */
 
     return NULL;
 }
diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk
index 370bf542a5a7..423d95167ab0 100644
--- a/xmlsecurity/util/makefile.mk
+++ b/xmlsecurity/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.8 $
+#   $Revision: 1.9 $
 #
-#   last change: $Author: mmi $ $Date: 2004-07-20 00:22:39 $
+#   last change: $Author: mt $ $Date: 2004-07-21 14:34:06 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -131,10 +131,10 @@ SHL2STDLIBS +=			\
 .IF "$(CRYPTO_ENGINE)" == "mscrypto"
 SHL2STDLIBS+= "ixml2.lib" "xmlsec.lib" "xmlsec-mscrypto.lib" "crypt32.lib" "advapi32.lib"
 .ELSE
-SHL2STDLIBS+= "ixml2.lib" "nss3.lib" "nspr4.lib" "plc4.lib" "xmlsec.lib" "xmlsec-nss.lib" "xpcom.lib"
+SHL2STDLIBS+= "ixml2.lib" "nss3.lib" "nspr4.lib" "plc4.lib" "xmlsec.lib" "xmlsec-nss.lib"
 .ENDIF
 .ELSE
-SHL2STDLIBS+= "-lxml2" "-lnss3" "-lnspr4" "-lplc4" "-lxmlsec" "-lxmlsec-nss" "-lxpcom" "-lxpcomglue"
+SHL2STDLIBS+= "-lxml2" "-lnss3" "-lnspr4" "-lplc4" "-lxmlsec" "-lxmlsec-nss"  
 .ENDIF
     
 SHL2IMPLIB = $(SHL2TARGET)
-- 
cgit v1.2.3