Author: prabath
Date: Thu Jul 10 03:58:28 2008
New Revision: 19088
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=19088

Log:
IDENTITY-199 

Modified:
   
trunk/solutions/identity/modules/mod-cspace/build/win32/vc/apache2/mod_cspace/mod_cspace.vcproj
   trunk/solutions/identity/modules/mod-cspace/src/process_request.c

Modified: 
trunk/solutions/identity/modules/mod-cspace/build/win32/vc/apache2/mod_cspace/mod_cspace.vcproj
URL: 
http://wso2.org/svn/browse/wso2/trunk/solutions/identity/modules/mod-cspace/build/win32/vc/apache2/mod_cspace/mod_cspace.vcproj?rev=19088&r1=19087&r2=19088&view=diff
==============================================================================
--- 
trunk/solutions/identity/modules/mod-cspace/build/win32/vc/apache2/mod_cspace/mod_cspace.vcproj
     (original)
+++ 
trunk/solutions/identity/modules/mod-cspace/build/win32/vc/apache2/mod_cspace/mod_cspace.vcproj
     Thu Jul 10 03:58:28 2008
@@ -40,7 +40,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions="/D 
&quot;APU_DECLARE_EXPORT&quot; "
+                               AdditionalOptions="/D 
&quot;APU_DECLARE_EXPORT&quot;  "
                                Optimization="0"
                                
AdditionalIncludeDirectories="W:\openssl\include;&quot;W:\libxslt-1.1.22.win32\include&quot;;&quot;W:\libxmlsec-1.2.11.win32\include&quot;;&quot;W:\libxml2-2.6.30.win32\include&quot;;&quot;W:\iconv-1.9.2.win32\include&quot;;W:\apache2.2\include"
                                
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_CSPACE_EXPORTS;XMLSEC_CRYPTO_DYNAMIC_LOADING;XMLSEC_CRYPTO=\&quot;openssl\&quot;;CSPACE_DEBUG"
@@ -63,6 +63,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/NODEFAULTLIB:MSVCRT"
                                AdditionalDependencies="apr-1.lib libxml2.lib 
libhttpd.lib aprutil-1.lib libapr-1.lib libxslt.lib libxmlsec.lib 
libeay32MD.lib libxmlsec-mscrypto.lib"
                                LinkIncremental="2"
                                
AdditionalLibraryDirectories="&quot;W:\libxmlsec-1.2.11.win32&quot;;&quot;W:\libxml2-2.6.30.win32&quot;;W:\apache2.2;W:\openssl;&quot;W:\libxslt-1.1.22.win32&quot;"
@@ -122,7 +123,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="&quot;E:\packages\libxml2-2.6.30.win32\include&quot;;&quot;E:\packages\libxmlsec-1.2.10.win32\include&quot;;&quot;E:\packages\libxslt-1.1.22.win32\include&quot;;&quot;C:\Program
 Files\Apache Software 
Foundation\Apache2.2\include&quot;;&quot;E:\packages\iconv-1.9.2.win32\include&quot;"
+                               
AdditionalIncludeDirectories="W:\openssl\include;&quot;W:\libxslt-1.1.22.win32\include&quot;;&quot;W:\libxmlsec-1.2.11.win32\include&quot;;&quot;W:\libxml2-2.6.30.win32\include&quot;;&quot;W:\iconv-1.9.2.win32\include&quot;;W:\apache2.2\include"
                                
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_CSPACE_EXPORTS;XMLSEC_CRYPTO_DYNAMIC_LOADING;XMLSEC_CRYPTO=\&quot;openssl\&quot;"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
@@ -143,7 +144,7 @@
                                Name="VCLinkerTool"
                                AdditionalDependencies="apr-1.lib libxml2.lib 
libhttpd.lib aprutil-1.lib libapr-1.lib libxslt.lib libxmlsec.lib"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="&quot;C:\Program 
Files\Apache Software 
Foundation\Apache2.2\lib&quot;;&quot;E:\packages\libxml2-2.6.30.win32\lib&quot;;&quot;E:\packages\libxmlsec-1.2.10.win32\lib&quot;;&quot;E:\packages\libxslt-1.1.22.win32\lib&quot;"
+                               
AdditionalLibraryDirectories="&quot;W:\libxmlsec-1.2.11.win32&quot;;&quot;W:\libxml2-2.6.30.win32&quot;;W:\apache2.2;W:\openssl;&quot;W:\libxslt-1.1.22.win32&quot;"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                OptimizeReferences="2"

Modified: trunk/solutions/identity/modules/mod-cspace/src/process_request.c
URL: 
http://wso2.org/svn/browse/wso2/trunk/solutions/identity/modules/mod-cspace/src/process_request.c?rev=19088&r1=19087&r2=19088&view=diff
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/src/process_request.c   
(original)
+++ trunk/solutions/identity/modules/mod-cspace/src/process_request.c   Thu Jul 
10 03:58:28 2008
@@ -239,7 +239,7 @@
         goto done;
     }
 
-    if (dsig_ctx->status != xmlSecDSigStatusSucceeded) {
+    if (dsig_ctx->status == xmlSecDSigStatusInvalid) {
         goto done;
     }
 
@@ -557,12 +557,14 @@
  
     if(enc_ctx->resultReplaced == 0) {
         /*log -- binary data*/
-        goto done;
+           // the flag: if set then resulted <enc:EncryptedData/> 
+               // or <enc:EncryptedKey/> node is added to the document
+        // goto done;
     }
 
 #ifdef CSPACE_DEBUG
     /*should log properly*/
-    xmlDocDump(stdout, doc);
+    //TODO: xmlDocDump(stdout, doc);
 #endif
 
     res = SUCC;

_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev

Reply via email to