blautenb 2003/09/15 05:00:10
Modified: c/Projects/VC6.0/xsec/cipher cipher.dsp
c/Projects/VC6.0/xsec/xsec_lib xsec_lib.dsp
c/src/enc XSECKeyInfoResolver.hpp
XSECKeyInfoResolverDefault.cpp
XSECKeyInfoResolverDefault.hpp
Log:
Integration of AlgorithmMapper and DSIG KeyInfo loading
Revision Changes Path
1.3 +10 -2 xml-security/c/Projects/VC6.0/xsec/cipher/cipher.dsp
Index: cipher.dsp
===================================================================
RCS file: /home/cvs/xml-security/c/Projects/VC6.0/xsec/cipher/cipher.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cipher.dsp 11 Sep 2003 11:15:44 -0000 1.2
+++ cipher.dsp 15 Sep 2003 12:00:10 -0000 1.3
@@ -42,7 +42,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D
"_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../include" /D "WIN32" /D
"NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../../include" /D "WIN32" /D
"NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0xc09 /d "NDEBUG"
# ADD RSC /l 0xc09 /d "NDEBUG"
BSC32=bscmake.exe
@@ -66,7 +66,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /D
"WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../../../include" /D
"WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /FR /YX /FD /GZ /c
# ADD BASE RSC /l 0xc09 /d "_DEBUG"
# ADD RSC /l 0xc09 /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
@@ -89,10 +89,18 @@
SOURCE=..\..\..\..\src\tools\cipher\cipher.cpp
# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\tools\cipher\MerlinFiveInteropResolver.cpp
+# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\src\tools\cipher\MerlinFiveInteropResolver.hpp
+# End Source File
# End Group
# Begin Group "Resource Files"
1.20 +32 -4 xml-security/c/Projects/VC6.0/xsec/xsec_lib/xsec_lib.dsp
Index: xsec_lib.dsp
===================================================================
RCS file: /home/cvs/xml-security/c/Projects/VC6.0/xsec/xsec_lib/xsec_lib.dsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xsec_lib.dsp 12 Sep 2003 09:47:17 -0000 1.19
+++ xsec_lib.dsp 15 Sep 2003 12:00:10 -0000 1.20
@@ -654,6 +654,18 @@
# PROP Default_Filter ""
# Begin Source File
+SOURCE=..\..\..\..\src\framework\XSECAlgorithmHandler.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\framework\XSECAlgorithmMapper.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\framework\XSECAlgorithmMapper.hpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\src\framework\XSECDefs.hpp
!IF "$(CFG)" == "xsec_lib - Win32 Release"
@@ -713,6 +725,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\..\..\src\framework\XSECEnv.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\src\framework\XSECEnv.hpp
# End Source File
# Begin Source File
@@ -904,6 +920,14 @@
# PROP Default_Filter ""
# Begin Source File
+SOURCE=..\..\..\..\src\xenc\impl\XENCAlgorithmHandlerDefault.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\xenc\impl\XENCAlgorithmHandlerDefault.hpp
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\..\src\xenc\impl\XENCCipherDataImpl.cpp
# End Source File
# Begin Source File
@@ -942,6 +966,14 @@
SOURCE=..\..\..\..\src\xenc\impl\XENCEncryptedTypeImpl.hpp
# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\xenc\impl\XENCEncryptionMethodImpl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\xenc\impl\XENCEncryptionMethodImpl.hpp
+# End Source File
# End Group
# Begin Source File
@@ -968,9 +1000,5 @@
SOURCE=..\..\..\..\src\xenc\XENCEncryptionMethod.hpp
# End Source File
# End Group
-# Begin Source File
-
-SOURCE=..\..\..\..\src\framework\XSECEnv.cpp
-# End Source File
# End Target
# End Project
1.6 +2 -2 xml-security/c/src/enc/XSECKeyInfoResolver.hpp
Index: XSECKeyInfoResolver.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/XSECKeyInfoResolver.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSECKeyInfoResolver.hpp 5 Jul 2003 10:30:32 -0000 1.5
+++ XSECKeyInfoResolver.hpp 15 Sep 2003 12:00:10 -0000 1.6
@@ -136,7 +136,7 @@
*
*/
- virtual XSECKeyInfoResolver * clone(void) = 0;
+ virtual XSECKeyInfoResolver * clone(void) const = 0;
//@}
1.7 +2 -2 xml-security/c/src/enc/XSECKeyInfoResolverDefault.cpp
Index: XSECKeyInfoResolverDefault.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/XSECKeyInfoResolverDefault.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSECKeyInfoResolverDefault.cpp 11 Sep 2003 11:12:58 -0000 1.6
+++ XSECKeyInfoResolverDefault.cpp 15 Sep 2003 12:00:10 -0000 1.7
@@ -189,7 +189,7 @@
}
-XSECKeyInfoResolver * XSECKeyInfoResolverDefault::clone(void) {
+XSECKeyInfoResolver * XSECKeyInfoResolverDefault::clone(void) const {
return new XSECKeyInfoResolverDefault();
1.6 +1 -1 xml-security/c/src/enc/XSECKeyInfoResolverDefault.hpp
Index: XSECKeyInfoResolverDefault.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/XSECKeyInfoResolverDefault.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSECKeyInfoResolverDefault.hpp 5 Jul 2003 10:30:32 -0000 1.5
+++ XSECKeyInfoResolverDefault.hpp 15 Sep 2003 12:00:10 -0000 1.6
@@ -135,7 +135,7 @@
* @see XSECKeyInfoResolver::clone()
*/
- virtual XSECKeyInfoResolver * clone(void);
+ virtual XSECKeyInfoResolver * clone(void) const;
//@}
