You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by bl...@apache.org on 2005/02/26 04:17:08 UTC
cvs commit: xml-security/c/src/xkms/impl XKMSCompoundRequestImpl.cpp XKMSCompoundResultImpl.cpp XKMSLocateRequestImpl.cpp XKMSLocateResultImpl.cpp XKMSMessageAbstractTypeImpl.hpp XKMSMessageFactoryImpl.cpp XKMSPendingRequestImpl.cpp XKMSRegisterRequestImpl.cpp XKMSRegisterResultImpl.cpp XKMSRequestAbstractTypeImpl.hpp XKMSResultImpl.cpp XKMSStatusRequestImpl.cpp XKMSStatusResultImpl.cpp XKMSValidateRequestImpl.cpp XKMSValidateResultImpl.cpp
blautenb 2005/02/25 19:17:08
Modified: c/Projects/VC6.0/xsec/c14n c14n.dsp
c/Projects/VC6.0/xsec/checksig checksig.dsp
c/Projects/VC6.0/xsec/cipher cipher.dsp
c/Projects/VC6.0/xsec/siginf siginf.dsp
c/Projects/VC6.0/xsec/templatesign templatesign.dsp
c/Projects/VC6.0/xsec/threadTest threadTest.dsp
c/Projects/VC6.0/xsec/txfmout txfmout.dsp
c/Projects/VC6.0/xsec/xklient xklient.dsp
c/Projects/VC6.0/xsec/xsec_lib xsec_lib.dsp
c/Projects/VC6.0/xsec/xtest xtest.dsp
c/src/enc/WinCAPI WinCAPICryptoSymmetricKey.cpp
c/src/tools/cipher XencInteropResolver.cpp
c/src/tools/xklient xklient.cpp
c/src/tools/xtest xtest.cpp
c/src/transformers TXFMCipher.cpp
c/src/xenc/impl XENCAlgorithmHandlerDefault.cpp
XENCCipherImpl.cpp
c/src/xkms XKMSCompoundRequest.hpp XKMSCompoundResult.hpp
XKMSLocateRequest.hpp XKMSLocateResult.hpp
XKMSPendingRequest.hpp XKMSRegisterRequest.hpp
XKMSRegisterResult.hpp XKMSRequestAbstractType.hpp
XKMSResult.hpp XKMSResultType.hpp
XKMSStatusRequest.hpp XKMSStatusResult.hpp
XKMSValidateRequest.hpp XKMSValidateResult.hpp
c/src/xkms/impl XKMSCompoundRequestImpl.cpp
XKMSCompoundResultImpl.cpp
XKMSLocateRequestImpl.cpp XKMSLocateResultImpl.cpp
XKMSMessageAbstractTypeImpl.hpp
XKMSMessageFactoryImpl.cpp
XKMSPendingRequestImpl.cpp
XKMSRegisterRequestImpl.cpp
XKMSRegisterResultImpl.cpp
XKMSRequestAbstractTypeImpl.hpp XKMSResultImpl.cpp
XKMSStatusRequestImpl.cpp XKMSStatusResultImpl.cpp
XKMSValidateRequestImpl.cpp
XKMSValidateResultImpl.cpp
Log:
Remove dynamic_casts and RTTI requirement
Revision Changes Path
1.7 +3 -3 xml-security/c/Projects/VC6.0/xsec/c14n/c14n.dsp
Index: c14n.dsp
===================================================================
RCS file: /home/cvs/xml-security/c/Projects/VC6.0/xsec/c14n/c14n.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- c14n.dsp 14 Mar 2004 03:48:52 -0000 1.6
+++ c14n.dsp 26 Feb 2005 03:17:07 -0000 1.7
@@ -44,7 +44,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
# SUBTRACT CPP /Fr
# ADD BASE RSC /l 0xc09 /d "NDEBUG"
# ADD RSC /l 0xc09 /d "NDEBUG"
@@ -97,7 +97,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "%LIBWWW%\SRC" /I "../../../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
# SUBTRACT BASE CPP /X
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "%LIBWWW%\SRC" /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 "%LIBWWW%\SRC" /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /FR /YX /FD /GZ /c
# SUBTRACT CPP /X
# ADD BASE RSC /l 0xc09 /d "_DEBUG"
# ADD RSC /l 0xc09 /d "_DEBUG" /d "_AFXDLL"
@@ -124,7 +124,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../../../../src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# SUBTRACT BASE CPP /Fr
-# ADD CPP /nologo /MD /W3 /GR /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
# SUBTRACT CPP /Fr
# ADD BASE RSC /l 0xc09 /d "NDEBUG"
# ADD RSC /l 0xc09 /d "NDEBUG"
1.8 +4 -4 xml-security/c/Projects/VC6.0/xsec/checksig/checksig.dsp
Index: checksig.dsp
===================================================================
RCS file: /home/cvs/xml-security/c/Projects/VC6.0/xsec/checksig/checksig.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- checksig.dsp 14 Mar 2004 03:48:52 -0000 1.7
+++ checksig.dsp 26 Feb 2005 03:17:07 -0000 1.8
@@ -44,7 +44,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
@@ -68,7 +68,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 /GR /GX /ZI /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /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" /YX /FD /GZ /c
# ADD BASE RSC /l 0xc09 /d "_DEBUG"
# ADD RSC /l 0xc09 /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
@@ -93,7 +93,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "%LIBWWW%\Library\External" /I "%LIBWWW%\Library\Src" /I "../../../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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" /Yc /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" /Yc /FD /GZ /c
# ADD BASE RSC /l 0xc09 /d "_DEBUG"
# ADD RSC /l 0xc09 /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
@@ -118,7 +118,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "%LIBWWW%\Library\External" /I "%LIBWWW%\Library\Src" /I "../../../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Od /Ob1 /I "%LIBWWW%\Library\External" /I "%LIBWWW%\Library\Src" /I "../../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /Od /Ob1 /I "%LIBWWW%\Library\External" /I "%LIBWWW%\Library\Src" /I "../../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0xc09 /d "_DEBUG"
# ADD RSC /l 0xc09 /d "NDEBUG"
BSC32=bscmake.exe
1.6 +4 -4 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cipher.dsp 14 Mar 2004 03:48:52 -0000 1.5
+++ cipher.dsp 26 Feb 2005 03:17:07 -0000 1.6
@@ -44,7 +44,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 /GR /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
@@ -68,7 +68,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 /GR /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
@@ -93,7 +93,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE 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 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 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" /d "_AFXDLL"
# ADD RSC /l 0xc09 /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
@@ -118,7 +118,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GR /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 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
1.7 +3 -3 xml-security/c/Projects/VC6.0/xsec/siginf/siginf.dsp
Index: siginf.dsp
===================================================================
RCS file: /home/cvs/xml-security/c/Projects/VC6.0/xsec/siginf/siginf.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- siginf.dsp 14 Mar 2004 03:48:52 -0000 1.6
+++ siginf.dsp 26 Feb 2005 03:17:07 -0000 1.7
@@ -44,7 +44,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
@@ -93,7 +93,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /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" /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" /YX /FD /GZ /c
# ADD BASE RSC /l 0xc09 /d "_DEBUG" /d "_AFXDLL"
# ADD RSC /l 0xc09 /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
@@ -118,7 +118,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 /GR /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
1.8 +3 -3 xml-security/c/Projects/VC6.0/xsec/templatesign/templatesign.dsp
Index: templatesign.dsp
===================================================================
RCS file: /home/cvs/xml-security/c/Projects/VC6.0/xsec/templatesign/templatesign.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- templatesign.dsp 14 Mar 2004 03:48:52 -0000 1.7
+++ templatesign.dsp 26 Feb 2005 03:17:07 -0000 1.8
@@ -44,7 +44,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
@@ -93,7 +93,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "../../../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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" /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" /YX /FD /GZ /c
# ADD BASE RSC /l 0xc09 /d "_DEBUG"
# ADD RSC /l 0xc09 /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
@@ -117,7 +117,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../../../../src" /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 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
1.8 +3 -3 xml-security/c/Projects/VC6.0/xsec/threadTest/threadTest.dsp
Index: threadTest.dsp
===================================================================
RCS file: /home/cvs/xml-security/c/Projects/VC6.0/xsec/threadTest/threadTest.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- threadTest.dsp 14 Mar 2004 03:48:52 -0000 1.7
+++ threadTest.dsp 26 Feb 2005 03:17:07 -0000 1.8
@@ -44,7 +44,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
@@ -92,7 +92,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /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 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
@@ -116,7 +116,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /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" /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" /YX /FD /GZ /c
# ADD BASE RSC /l 0xc09 /d "_DEBUG" /d "_AFXDLL"
# ADD RSC /l 0xc09 /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
1.7 +3 -3 xml-security/c/Projects/VC6.0/xsec/txfmout/txfmout.dsp
Index: txfmout.dsp
===================================================================
RCS file: /home/cvs/xml-security/c/Projects/VC6.0/xsec/txfmout/txfmout.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- txfmout.dsp 14 Mar 2004 03:48:52 -0000 1.6
+++ txfmout.dsp 26 Feb 2005 03:17:07 -0000 1.7
@@ -44,7 +44,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
@@ -93,7 +93,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /I "../../../../src" /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 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
@@ -118,7 +118,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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" /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" /YX /FD /GZ /c
# ADD BASE RSC /l 0xc09 /d "_DEBUG"
# ADD RSC /l 0xc09 /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
1.3 +2 -2 xml-security/c/Projects/VC6.0/xsec/xklient/xklient.dsp
Index: xklient.dsp
===================================================================
RCS file: /home/cvs/xml-security/c/Projects/VC6.0/xsec/xklient/xklient.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xklient.dsp 9 Jun 2004 04:07:23 -0000 1.2
+++ xklient.dsp 26 Feb 2005 03:17:07 -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 /GR /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 /GR /GX /ZI /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /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" /YX /FD /GZ /c
# ADD BASE RSC /l 0xc09 /d "_DEBUG"
# ADD RSC /l 0xc09 /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
1.41 +4 -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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xsec_lib.dsp 4 Nov 2004 11:07:04 -0000 1.40
+++ xsec_lib.dsp 26 Feb 2005 03:17:07 -0000 1.41
@@ -45,7 +45,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSEC_LIB_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSEC_LIB_EXPORTS" /D "PROJ_CANON" /D "PROJ_DSIG" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSEC_LIB_EXPORTS" /D "PROJ_CANON" /D "PROJ_DSIG" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0xc09 /d "NDEBUG"
@@ -72,7 +72,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSEC_LIB_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "%LIBWWW%\Library\External" /I "%LIBWWW%\Library\Src" /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSEC_LIB_EXPORTS" /D "PROJ_CANON" /D "PROJ_DSIG" /D "_WINDLL" /D "_AFXDLL" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /ZI /Od /I "%LIBWWW%\Library\External" /I "%LIBWWW%\Library\Src" /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSEC_LIB_EXPORTS" /D "PROJ_CANON" /D "PROJ_DSIG" /D "_WINDLL" /D "_AFXDLL" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0xc09 /d "_DEBUG"
@@ -100,7 +100,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "%LIBWWW%\Library\External" /I "%LIBWWW%\Library\Src" /I "../../../../src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSEC_LIB_EXPORTS" /D "PROJ_CANON" /D "PROJ_DSIG" /FR /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "%LIBWWW%\Library\External" /I "%LIBWWW%\Library\Src" /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSEC_LIB_EXPORTS" /D "PROJ_CANON" /D "PROJ_DSIG" /D "_WINDLL" /D "_AFXDLL" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /ZI /Od /I "%LIBWWW%\Library\External" /I "%LIBWWW%\Library\Src" /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSEC_LIB_EXPORTS" /D "PROJ_CANON" /D "PROJ_DSIG" /D "_WINDLL" /D "_AFXDLL" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0xc09 /d "_DEBUG"
@@ -128,7 +128,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../../../../src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSEC_LIB_EXPORTS" /D "PROJ_CANON" /D "PROJ_DSIG" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSEC_LIB_EXPORTS" /D "PROJ_CANON" /D "PROJ_DSIG" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "../../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSEC_LIB_EXPORTS" /D "PROJ_CANON" /D "PROJ_DSIG" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0xc09 /d "NDEBUG"
1.8 +4 -4 xml-security/c/Projects/VC6.0/xsec/xtest/xtest.dsp
Index: xtest.dsp
===================================================================
RCS file: /home/cvs/xml-security/c/Projects/VC6.0/xsec/xtest/xtest.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xtest.dsp 14 Mar 2004 03:48:52 -0000 1.7
+++ xtest.dsp 26 Feb 2005 03:17:07 -0000 1.8
@@ -44,7 +44,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 /GR /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
# SUBTRACT CPP /Fr
# ADD BASE RSC /l 0xc09 /d "NDEBUG"
# ADD RSC /l 0xc09 /d "NDEBUG"
@@ -70,7 +70,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 /GR /GX /ZI /Od /I "%LIBWWW%\Library\External" /I "%LIBWWW%\Library\Src" /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WWW_WIN_ASYNC" /D "_AFXDLL" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /ZI /Od /I "%LIBWWW%\Library\External" /I "%LIBWWW%\Library\Src" /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WWW_WIN_ASYNC" /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
@@ -95,7 +95,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "%LIBWWW%\Library\External" /I "%LIBWWW%\Library\Src" /I "../../../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WWW_WIN_ASYNC" /FR /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "%LIBWWW%\Library\External" /I "%LIBWWW%\Library\Src" /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WWW_WIN_ASYNC" /D "_AFXDLL" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /ZI /Od /I "%LIBWWW%\Library\External" /I "%LIBWWW%\Library\Src" /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WWW_WIN_ASYNC" /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
@@ -121,7 +121,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../../../../src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# SUBTRACT BASE CPP /Fr
-# ADD CPP /nologo /MD /W3 /GR /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
# SUBTRACT CPP /Fr
# ADD BASE RSC /l 0xc09 /d "NDEBUG"
# ADD RSC /l 0xc09 /d "NDEBUG"
1.9 +8 -2 xml-security/c/src/enc/WinCAPI/WinCAPICryptoSymmetricKey.cpp
Index: WinCAPICryptoSymmetricKey.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/WinCAPI/WinCAPICryptoSymmetricKey.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WinCAPICryptoSymmetricKey.cpp 3 Feb 2005 13:20:37 -0000 1.8
+++ WinCAPICryptoSymmetricKey.cpp 26 Feb 2005 03:17:07 -0000 1.9
@@ -26,6 +26,7 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/utils/XSECPlatformUtils.hpp>
+#include <xsec/utils/XSECDOMUtils.hpp>
#include <xsec/enc/WinCAPI/WinCAPICryptoProvider.hpp>
#include <xsec/enc/WinCAPI/WinCAPICryptoSymmetricKey.hpp>
#include <xsec/framework/XSECError.hpp>
@@ -581,8 +582,13 @@
HCRYPTPROV p;
if (prov == NULL || *prov == 0) {
+ if (!strEquals(XSECPlatformUtils::g_cryptoProvider->getProviderName(), DSIGConstants::s_unicodeStrPROVWinCAPI)) {
+ throw XSECCryptoException(XSECCryptoException::SymmetricError,
+ "WinCAPI:SymmetricKey - Main provider is not Windows provider");
+ }
+
WinCAPICryptoProvider * cp =
- dynamic_cast<WinCAPICryptoProvider*>(XSECPlatformUtils::g_cryptoProvider);
+ (WinCAPICryptoProvider*) XSECPlatformUtils::g_cryptoProvider;
p = cp->getApacheKeyStore();
1.10 +4 -4 xml-security/c/src/tools/cipher/XencInteropResolver.cpp
Index: XencInteropResolver.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/cipher/XencInteropResolver.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XencInteropResolver.cpp 3 Feb 2005 13:39:01 -0000 1.9
+++ XencInteropResolver.cpp 26 Feb 2005 03:17:07 -0000 1.10
@@ -343,7 +343,7 @@
if (ki->getKeyInfoType() == DSIGKeyInfo::KEYINFO_NAME) {
- DSIGKeyInfoName * kn = dynamic_cast<DSIGKeyInfoName *>(ki);
+ DSIGKeyInfoName * kn = (DSIGKeyInfoName *) ki;
const XMLCh * name = kn->getKeyName();
@@ -513,7 +513,7 @@
else if (ki->getKeyInfoType() == DSIGKeyInfo::KEYINFO_X509) {
- DSIGKeyInfoX509 * kix = dynamic_cast<DSIGKeyInfoX509 *> (ki);
+ DSIGKeyInfoX509 * kix = (DSIGKeyInfoX509 *) ki;
XSECCryptoX509 * XCX509 = kix->getCertificateCryptoItem(0);
@@ -523,7 +523,7 @@
if (strEquals(XCX509->getProviderName(),DSIGConstants::s_unicodeStrPROVOpenSSL)) {
- OpenSSLCryptoX509 * OSSLX509 = dynamic_cast<OpenSSLCryptoX509 *>(XCX509);
+ OpenSSLCryptoX509 * OSSLX509 = (OpenSSLCryptoX509 *) XCX509;
X509 * x509 = OSSLX509->getOpenSSLX509();
// Check the serial number
1.32 +22 -22 xml-security/c/src/tools/xklient/xklient.cpp
Index: xklient.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/xklient/xklient.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xklient.cpp 3 Feb 2005 13:43:04 -0000 1.31
+++ xklient.cpp 26 Feb 2005 03:17:07 -0000 1.32
@@ -1486,7 +1486,7 @@
paramCount++;
XKMSLocateRequest * r =
- dynamic_cast<XKMSLocateRequest *> (createLocateRequest(prov, NULL, argc, argv, paramCount, cr));
+ (XKMSLocateRequest *) (createLocateRequest(prov, NULL, argc, argv, paramCount, cr));
if (r == NULL) {
delete cr;
@@ -1499,7 +1499,7 @@
paramCount++;
XKMSValidateRequest * r =
- dynamic_cast<XKMSValidateRequest *> (createValidateRequest(prov, NULL, argc, argv, paramCount, cr));
+ (XKMSValidateRequest *) (createValidateRequest(prov, NULL, argc, argv, paramCount, cr));
if (r == NULL) {
delete cr;
@@ -2088,10 +2088,10 @@
cout << "Compound Request\n\n";
- for (i = 0 ; i < (dynamic_cast<XKMSCompoundRequest *>(msg))->getRequestListSize(); ++i) {
+ for (i = 0 ; i < ((XKMSCompoundRequest *) (msg))->getRequestListSize(); ++i) {
cout << "Message " << i << endl;
- doMsgDump((dynamic_cast<XKMSCompoundRequest *>(msg))->getRequestListItem(i));
+ doMsgDump(((XKMSCompoundRequest *) msg)->getRequestListItem(i));
}
break;
@@ -2100,57 +2100,57 @@
cout << "Compound Result\n\n";
- for (i = 0 ; i < (dynamic_cast<XKMSCompoundResult *>(msg))->getResultListSize(); ++i) {
+ for (i = 0 ; i < ((XKMSCompoundResult *)(msg))->getResultListSize(); ++i) {
cout << "Message " << i << endl;
- doMsgDump((dynamic_cast<XKMSCompoundResult *>(msg))->getResultListItem(i));
+ doMsgDump(((XKMSCompoundResult *) msg)->getResultListItem(i));
}
break;
case XKMSMessageAbstractType::LocateRequest :
- doLocateRequestDump(dynamic_cast<XKMSLocateRequest *>(msg));
+ doLocateRequestDump((XKMSLocateRequest *) msg);
break;
case XKMSMessageAbstractType::LocateResult :
- doLocateResultDump(dynamic_cast<XKMSLocateResult *>(msg));
+ doLocateResultDump((XKMSLocateResult *) msg);
break;
case XKMSMessageAbstractType::StatusRequest :
- doStatusRequestDump(dynamic_cast<XKMSStatusRequest *>(msg));
+ doStatusRequestDump((XKMSStatusRequest *) msg);
break;
case XKMSMessageAbstractType::StatusResult :
- doStatusResultDump(dynamic_cast<XKMSStatusResult *>(msg));
+ doStatusResultDump((XKMSStatusResult *) msg);
break;
case XKMSMessageAbstractType::Result :
- doResultDump(dynamic_cast<XKMSResult *>(msg));
+ doResultDump((XKMSResult *) msg);
break;
case XKMSMessageAbstractType::ValidateRequest :
- doValidateRequestDump(dynamic_cast<XKMSValidateRequest *>(msg));
+ doValidateRequestDump((XKMSValidateRequest *) msg);
break;
case XKMSMessageAbstractType::ValidateResult :
- doValidateResultDump(dynamic_cast<XKMSValidateResult *>(msg));
+ doValidateResultDump((XKMSValidateResult *) msg);
break;
case XKMSMessageAbstractType::RegisterRequest :
- doRegisterRequestDump(dynamic_cast<XKMSRegisterRequest *>(msg));
+ doRegisterRequestDump((XKMSRegisterRequest *) msg);
break;
case XKMSMessageAbstractType::RegisterResult :
- doRegisterResultDump(dynamic_cast<XKMSRegisterResult *>(msg));
+ doRegisterResultDump((XKMSRegisterResult *) msg);
break;
default :
@@ -2381,7 +2381,7 @@
paramCount++;
XKMSLocateRequest * r =
- dynamic_cast<XKMSLocateRequest *> (createLocateRequest(prov, &doc, argc, argv, paramCount));
+ (XKMSLocateRequest *) (createLocateRequest(prov, &doc, argc, argv, paramCount));
if (r == NULL) {
return -1;
@@ -2399,7 +2399,7 @@
paramCount++;
XKMSValidateRequest * r =
- dynamic_cast<XKMSValidateRequest *> (createValidateRequest(prov, &doc, argc, argv, paramCount));
+ (XKMSValidateRequest *) (createValidateRequest(prov, &doc, argc, argv, paramCount));
if (r == NULL) {
return -1;
@@ -2416,7 +2416,7 @@
paramCount++;
XKMSRegisterRequest * r =
- dynamic_cast<XKMSRegisterRequest *> (createRegisterRequest(prov, &doc, argc, argv, paramCount));
+ (XKMSRegisterRequest *) (createRegisterRequest(prov, &doc, argc, argv, paramCount));
if (r == NULL) {
return -1;
@@ -2433,7 +2433,7 @@
paramCount++;
XKMSPendingRequest * r =
- dynamic_cast<XKMSPendingRequest *> (createPendingRequest(prov, &doc, argc, argv, paramCount));
+ (XKMSPendingRequest *) (createPendingRequest(prov, &doc, argc, argv, paramCount));
if (r == NULL) {
return -1;
@@ -2450,7 +2450,7 @@
paramCount++;
XKMSStatusRequest * r =
- dynamic_cast<XKMSStatusRequest *> (createStatusRequest(prov, &doc, argc, argv, paramCount));
+ (XKMSStatusRequest *) (createStatusRequest(prov, &doc, argc, argv, paramCount));
if (r == NULL) {
return -1;
@@ -2466,7 +2466,7 @@
(stricmp(argv[paramCount], "cr") == 0)) {
XKMSCompoundRequest * r =
- dynamic_cast<XKMSCompoundRequest *> (createCompoundRequest(prov, &doc, argc, argv, paramCount + 1));
+ (XKMSCompoundRequest *) (createCompoundRequest(prov, &doc, argc, argv, paramCount + 1));
if (r == NULL) {
return -1;
1.51 +4 -4 xml-security/c/src/tools/xtest/xtest.cpp
Index: xtest.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/xtest/xtest.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xtest.cpp 25 Feb 2005 22:20:41 -0000 1.50
+++ xtest.cpp 26 Feb 2005 03:17:07 -0000 1.51
@@ -1643,7 +1643,7 @@
#if defined (HAVE_WINCAPI)
// Use the internal key
- WinCAPICryptoProvider *cp = dynamic_cast<WinCAPICryptoProvider *>(XSECPlatformUtils::g_cryptoProvider);
+ WinCAPICryptoProvider *cp = (WinCAPICryptoProvider *) (XSECPlatformUtils::g_cryptoProvider);
HCRYPTPROV p = cp->getApacheKeyStore();
WinCAPICryptoKeyRSA * rsaKey = new WinCAPICryptoKeyRSA(p, AT_KEYEXCHANGE, true);
@@ -1927,7 +1927,7 @@
if (kil->item(i)->getKeyInfoType() == DSIGKeyInfo::KEYINFO_NAME) {
- DSIGKeyInfoName *n = dynamic_cast<DSIGKeyInfoName *>(kil->item(i));
+ DSIGKeyInfoName *n = (DSIGKeyInfoName *) (kil->item(i));
if (!strEquals(n->getKeyName(), s_tstKeyName)) {
cerr << "no!" << endl;
@@ -1954,7 +1954,7 @@
if (kil->item(i)->getKeyInfoType() == DSIGKeyInfo::KEYINFO_ENCRYPTEDKEY) {
- XENCEncryptedKey * xek = dynamic_cast<XENCEncryptedKey*>(kil->item(i));
+ XENCEncryptedKey * xek = (XENCEncryptedKey*)(kil->item(i));
if (strEquals(xek->getCarriedKeyName(), s_tstCarriedKeyName)) {
1.7 +4 -4 xml-security/c/src/transformers/TXFMCipher.cpp
Index: TXFMCipher.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMCipher.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TXFMCipher.cpp 3 Feb 2005 13:50:12 -0000 1.6
+++ TXFMCipher.cpp 26 Feb 2005 03:17:07 -0000 1.7
@@ -53,9 +53,9 @@
try {
if (mp_cipher->getKeyType() == XSECCryptoKey::KEY_SYMMETRIC && m_doEncrypt)
- (dynamic_cast<XSECCryptoSymmetricKey *>(mp_cipher))->encryptInit();
+ ((XSECCryptoSymmetricKey *) (mp_cipher))->encryptInit();
else
- (dynamic_cast<XSECCryptoSymmetricKey *>(mp_cipher))->decryptInit();
+ ((XSECCryptoSymmetricKey *) (mp_cipher))->decryptInit();
}
catch (...) {
delete mp_cipher;
@@ -137,7 +137,7 @@
if (mp_cipher->getKeyType() == XSECCryptoKey::KEY_SYMMETRIC) {
XSECCryptoSymmetricKey * symCipher =
- dynamic_cast<XSECCryptoSymmetricKey*>(mp_cipher);
+ (XSECCryptoSymmetricKey*) mp_cipher;
if (m_doEncrypt) {
if (sz == 0) {
1.13 +10 -16 xml-security/c/src/xenc/impl/XENCAlgorithmHandlerDefault.cpp
Index: XENCAlgorithmHandlerDefault.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCAlgorithmHandlerDefault.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XENCAlgorithmHandlerDefault.cpp 3 Feb 2005 14:05:59 -0000 1.12
+++ XENCAlgorithmHandlerDefault.cpp 26 Feb 2005 03:17:08 -0000 1.13
@@ -103,7 +103,7 @@
case XSECCryptoKey::KEY_SYMMETRIC :
- keySymmetric = dynamic_cast<XSECCryptoSymmetricKey *>(key);
+ keySymmetric = (XSECCryptoSymmetricKey *) key;
if (keySymmetric != NULL) {
skt = keySymmetric->getSymmetricKeyType();
@@ -176,7 +176,7 @@
// Do the decrypt - this cast will throw if wrong, but we should
// not have been able to get through algorithm checks otherwise
- XSECCryptoSymmetricKey * sk = dynamic_cast<XSECCryptoSymmetricKey *>(key);
+ XSECCryptoSymmetricKey * sk = (XSECCryptoSymmetricKey *) key;
int blocks = sz / 8;
int n = blocks - 1;
@@ -253,7 +253,7 @@
// Do the decrypt - this cast will throw if wrong, but we should
// not have been able to get through algorithm checks otherwise
- XSECCryptoSymmetricKey * sk = dynamic_cast<XSECCryptoSymmetricKey *>(key);
+ XSECCryptoSymmetricKey * sk = (XSECCryptoSymmetricKey *) key;
int n = sz / 8;
@@ -345,7 +345,7 @@
// Do the decrypt - this cast will throw if wrong, but we should
// not have been able to get through algorithm checks otherwise
- XSECCryptoSymmetricKey * sk = dynamic_cast<XSECCryptoSymmetricKey *>(key);
+ XSECCryptoSymmetricKey * sk = (XSECCryptoSymmetricKey *) key;
sk->decryptInit(false, XSECCryptoSymmetricKey::MODE_CBC, s_3DES_CMS_IV);
// If key is bigger than this, then we have a problem
@@ -445,7 +445,7 @@
// Do the first encrypt - this cast will throw if wrong, but we should
// not have been able to get through algorithm checks otherwise
- XSECCryptoSymmetricKey * sk = dynamic_cast<XSECCryptoSymmetricKey *>(key);
+ XSECCryptoSymmetricKey * sk = (XSECCryptoSymmetricKey *) key;
sk->encryptInit(false);
// If key is bigger than this, then we have a problem
@@ -546,11 +546,9 @@
"XENCAlgorithmHandlerDefault - RSA Decrypt must use private key");
}
- XSECCryptoKeyRSA * rsa = dynamic_cast<XSECCryptoKeyRSA *>(key);
- if (rsa == NULL) {
- throw XSECException(XSECException::CipherError,
- "XENCAlgorithmHandlerDefault::doRSADecryptToSafeBuffer - Error casting to RSA key");
- }
+ // Know this is an RSA key, so just cast
+
+ XSECCryptoKeyRSA * rsa = (XSECCryptoKeyRSA *) key;
// Allocate an output buffer
unsigned char * decBuf;
@@ -747,11 +745,7 @@
"XENCAlgorithmHandlerDefault - RSA Encrypt must use public key");
}
- XSECCryptoKeyRSA * rsa = dynamic_cast<XSECCryptoKeyRSA *>(key);
- if (rsa == NULL) {
- throw XSECException(XSECException::CipherError,
- "XENCAlgorithmHandlerDefault::doRSAEncryptToSafeBuffer - Error casting to RSA key");
- }
+ XSECCryptoKeyRSA * rsa = (XSECCryptoKeyRSA *) key;
// Allocate an output buffer
unsigned char * encBuf;
1.23 +3 -3 xml-security/c/src/xenc/impl/XENCCipherImpl.cpp
Index: XENCCipherImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCCipherImpl.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- XENCCipherImpl.cpp 3 Feb 2005 14:05:59 -0000 1.22
+++ XENCCipherImpl.cpp 26 Feb 2005 03:17:08 -0000 1.23
@@ -363,7 +363,7 @@
if (kil->item(i)->getKeyInfoType() == DSIGKeyInfo::KEYINFO_ENCRYPTEDKEY) {
- XENCEncryptedKey * ek = dynamic_cast<XENCEncryptedKey*>(kil->item(i));
+ XENCEncryptedKey * ek = (XENCEncryptedKey*) (kil->item(i));
volatile XMLByte buffer[1024];
try {
// Have to cast off volatile
@@ -654,7 +654,7 @@
}
// Get the raw encrypted data
- TXFMChain * c = dynamic_cast<XENCEncryptedKeyImpl *>(encryptedKey)->createCipherTXFMChain();
+ TXFMChain * c = ((XENCEncryptedKeyImpl *) encryptedKey)->createCipherTXFMChain();
Janitor<TXFMChain> j_c(c);
// Get the Algorithm handler for the algorithm
1.4 +2 -2 xml-security/c/src/xkms/XKMSCompoundRequest.hpp
Index: XKMSCompoundRequest.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/XKMSCompoundRequest.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XKMSCompoundRequest.hpp 3 Feb 2005 14:15:49 -0000 1.3
+++ XKMSCompoundRequest.hpp 26 Feb 2005 03:17:08 -0000 1.4
@@ -70,7 +70,7 @@
\endverbatim
*/
-class XKMSCompoundRequest : virtual public XKMSRequestAbstractType {
+class XKMSCompoundRequest : public XKMSRequestAbstractType {
/** @name Constructors and Destructors */
//@{
1.5 +2 -2 xml-security/c/src/xkms/XKMSCompoundResult.hpp
Index: XKMSCompoundResult.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/XKMSCompoundResult.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XKMSCompoundResult.hpp 3 Feb 2005 14:15:49 -0000 1.4
+++ XKMSCompoundResult.hpp 26 Feb 2005 03:17:08 -0000 1.5
@@ -77,7 +77,7 @@
\endverbatim
*/
-class XKMSCompoundResult : virtual public XKMSResultType {
+class XKMSCompoundResult : public XKMSResultType {
/** @name Constructors and Destructors */
//@{
1.4 +2 -2 xml-security/c/src/xkms/XKMSLocateRequest.hpp
Index: XKMSLocateRequest.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/XKMSLocateRequest.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XKMSLocateRequest.hpp 3 Feb 2005 14:15:49 -0000 1.3
+++ XKMSLocateRequest.hpp 26 Feb 2005 03:17:08 -0000 1.4
@@ -63,7 +63,7 @@
\endverbatim
*/
-class XKMSLocateRequest : virtual public XKMSRequestAbstractType {
+class XKMSLocateRequest : public XKMSRequestAbstractType {
/** @name Constructors and Destructors */
//@{
1.3 +2 -2 xml-security/c/src/xkms/XKMSLocateResult.hpp
Index: XKMSLocateResult.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/XKMSLocateResult.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XKMSLocateResult.hpp 3 Feb 2005 14:15:49 -0000 1.2
+++ XKMSLocateResult.hpp 26 Feb 2005 03:17:08 -0000 1.3
@@ -65,7 +65,7 @@
\endverbatim
*/
-class XKMSLocateResult : virtual public XKMSResultType {
+class XKMSLocateResult : public XKMSResultType {
/** @name Constructors and Destructors */
//@{
1.3 +2 -2 xml-security/c/src/xkms/XKMSPendingRequest.hpp
Index: XKMSPendingRequest.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/XKMSPendingRequest.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XKMSPendingRequest.hpp 3 Feb 2005 14:15:49 -0000 1.2
+++ XKMSPendingRequest.hpp 26 Feb 2005 03:17:08 -0000 1.3
@@ -62,7 +62,7 @@
\endverbatim
*/
-class XKMSPendingRequest : virtual public XKMSRequestAbstractType {
+class XKMSPendingRequest : public XKMSRequestAbstractType {
/** @name Constructors and Destructors */
//@{
1.3 +2 -2 xml-security/c/src/xkms/XKMSRegisterRequest.hpp
Index: XKMSRegisterRequest.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/XKMSRegisterRequest.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XKMSRegisterRequest.hpp 3 Feb 2005 14:15:49 -0000 1.2
+++ XKMSRegisterRequest.hpp 26 Feb 2005 03:17:08 -0000 1.3
@@ -67,7 +67,7 @@
\endverbatim
*/
-class XKMSRegisterRequest : virtual public XKMSRequestAbstractType {
+class XKMSRegisterRequest : public XKMSRequestAbstractType {
/** @name Constructors and Destructors */
//@{
1.3 +2 -2 xml-security/c/src/xkms/XKMSRegisterResult.hpp
Index: XKMSRegisterResult.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/XKMSRegisterResult.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XKMSRegisterResult.hpp 3 Feb 2005 14:15:49 -0000 1.2
+++ XKMSRegisterResult.hpp 26 Feb 2005 03:17:08 -0000 1.3
@@ -66,7 +66,7 @@
\endverbatim
*/
-class XKMSRegisterResult : virtual public XKMSResultType {
+class XKMSRegisterResult : public XKMSResultType {
/** @name Constructors and Destructors */
//@{
1.6 +2 -2 xml-security/c/src/xkms/XKMSRequestAbstractType.hpp
Index: XKMSRequestAbstractType.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/XKMSRequestAbstractType.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XKMSRequestAbstractType.hpp 3 Feb 2005 14:15:49 -0000 1.5
+++ XKMSRequestAbstractType.hpp 26 Feb 2005 03:17:08 -0000 1.6
@@ -70,7 +70,7 @@
*/
-class XKMSRequestAbstractType : virtual public XKMSMessageAbstractType {
+class XKMSRequestAbstractType : public XKMSMessageAbstractType {
/** @name Constructors and Destructors */
//@{
1.3 +2 -2 xml-security/c/src/xkms/XKMSResult.hpp
Index: XKMSResult.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/XKMSResult.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XKMSResult.hpp 3 Feb 2005 14:15:49 -0000 1.2
+++ XKMSResult.hpp 26 Feb 2005 03:17:08 -0000 1.3
@@ -44,7 +44,7 @@
* there is no result. It is a straight instantiation of the ResultType
*/
-class XKMSResult : virtual public XKMSResultType {
+class XKMSResult : public XKMSResultType {
/** @name Constructors and Destructors */
//@{
1.4 +2 -2 xml-security/c/src/xkms/XKMSResultType.hpp
Index: XKMSResultType.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/XKMSResultType.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XKMSResultType.hpp 3 Feb 2005 14:15:49 -0000 1.3
+++ XKMSResultType.hpp 26 Feb 2005 03:17:08 -0000 1.4
@@ -64,7 +64,7 @@
*/
-class XKMSResultType : virtual public XKMSMessageAbstractType {
+class XKMSResultType : public XKMSMessageAbstractType {
public:
1.3 +2 -2 xml-security/c/src/xkms/XKMSStatusRequest.hpp
Index: XKMSStatusRequest.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/XKMSStatusRequest.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XKMSStatusRequest.hpp 3 Feb 2005 14:15:49 -0000 1.2
+++ XKMSStatusRequest.hpp 26 Feb 2005 03:17:08 -0000 1.3
@@ -58,7 +58,7 @@
<!-- /StatusRequest -->\endverbatim
*/
-class XKMSStatusRequest : virtual public XKMSRequestAbstractType {
+class XKMSStatusRequest : public XKMSRequestAbstractType {
/** @name Constructors and Destructors */
//@{
1.3 +2 -2 xml-security/c/src/xkms/XKMSStatusResult.hpp
Index: XKMSStatusResult.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/XKMSStatusResult.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XKMSStatusResult.hpp 3 Feb 2005 14:15:49 -0000 1.2
+++ XKMSStatusResult.hpp 26 Feb 2005 03:17:08 -0000 1.3
@@ -63,7 +63,7 @@
<!-- /StatusResult -->\endverbatim
*/
-class XKMSStatusResult : virtual public XKMSResultType {
+class XKMSStatusResult : public XKMSResultType {
/** @name Constructors and Destructors */
//@{
1.3 +2 -2 xml-security/c/src/xkms/XKMSValidateRequest.hpp
Index: XKMSValidateRequest.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/XKMSValidateRequest.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XKMSValidateRequest.hpp 3 Feb 2005 14:15:49 -0000 1.2
+++ XKMSValidateRequest.hpp 26 Feb 2005 03:17:08 -0000 1.3
@@ -63,7 +63,7 @@
\endverbatim
*/
-class XKMSValidateRequest : virtual public XKMSRequestAbstractType {
+class XKMSValidateRequest : public XKMSRequestAbstractType {
/** @name Constructors and Destructors */
//@{
1.4 +2 -2 xml-security/c/src/xkms/XKMSValidateResult.hpp
Index: XKMSValidateResult.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/XKMSValidateResult.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XKMSValidateResult.hpp 3 Feb 2005 14:15:49 -0000 1.3
+++ XKMSValidateResult.hpp 26 Feb 2005 03:17:08 -0000 1.4
@@ -66,7 +66,7 @@
\endverbatim
*/
-class XKMSValidateResult : virtual public XKMSResultType {
+class XKMSValidateResult : public XKMSResultType {
/** @name Constructors and Destructors */
//@{
1.4 +8 -7 xml-security/c/src/xkms/impl/XKMSCompoundRequestImpl.cpp
Index: XKMSCompoundRequestImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSCompoundRequestImpl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XKMSCompoundRequestImpl.cpp 3 Feb 2005 14:30:29 -0000 1.3
+++ XKMSCompoundRequestImpl.cpp 26 Feb 2005 03:17:08 -0000 1.4
@@ -104,8 +104,9 @@
strEquals(getXKMSLocalName(e), XKMSConstants::s_tagValidateRequest)) {
// Have a legitimate request to load
- XKMSMessageAbstractType * m = m_factory.newMessageFromDOM(e);
- m_requestList.push_back(dynamic_cast<XKMSRequestAbstractTypeImpl *>(m));
+ XKMSMessageAbstractTypeImpl * m =
+ (XKMSMessageAbstractTypeImpl *) m_factory.newMessageFromDOM(e);
+ m_requestList.push_back((XKMSRequestAbstractTypeImpl *) m);
}
@@ -134,7 +135,7 @@
XKMSMessageAbstractType::messageType XKMSCompoundRequestImpl::getMessageType(void) {
- return XKMSMessageAbstractType::CompoundRequest;
+ return XKMSMessageAbstractTypeImpl::CompoundRequest;
}
@@ -166,7 +167,7 @@
const XMLCh * id) {
XKMSLocateRequest * r = m_factory.createLocateRequest(service, mp_env->getParentDocument(), id);
- m_requestList.push_back(dynamic_cast<XKMSRequestAbstractTypeImpl*>(r));
+ m_requestList.push_back((XKMSRequestAbstractTypeImpl*) r);
mp_messageAbstractTypeElement->appendChild(r->getElement());
mp_env->doPrettyPrint(mp_messageAbstractTypeElement);
@@ -180,7 +181,7 @@
const XMLCh * id) {
XKMSValidateRequest * r = m_factory.createValidateRequest(service, mp_env->getParentDocument(), id);
- m_requestList.push_back(dynamic_cast<XKMSRequestAbstractTypeImpl*>(r));
+ m_requestList.push_back((XKMSRequestAbstractTypeImpl*) r);
mp_messageAbstractTypeElement->appendChild(r->getElement());
mp_env->doPrettyPrint(mp_messageAbstractTypeElement);
@@ -193,7 +194,7 @@
const XMLCh * id) {
XKMSRegisterRequest * r = m_factory.createRegisterRequest(service, mp_env->getParentDocument(), id);
- m_requestList.push_back(dynamic_cast<XKMSRequestAbstractTypeImpl*>(r));
+ m_requestList.push_back((XKMSRequestAbstractTypeImpl*) r);
mp_messageAbstractTypeElement->appendChild(r->getElement());
mp_env->doPrettyPrint(mp_messageAbstractTypeElement);
1.5 +10 -9 xml-security/c/src/xkms/impl/XKMSCompoundResultImpl.cpp
Index: XKMSCompoundResultImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSCompoundResultImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XKMSCompoundResultImpl.cpp 3 Feb 2005 14:30:29 -0000 1.4
+++ XKMSCompoundResultImpl.cpp 26 Feb 2005 03:17:08 -0000 1.5
@@ -106,8 +106,9 @@
strEquals(getXKMSLocalName(e), XKMSConstants::s_tagValidateResult)) {
// Have a legitimate Result to load
- XKMSMessageAbstractType * m = m_factory.newMessageFromDOM(e);
- m_resultList.push_back(dynamic_cast<XKMSResultTypeImpl *>(m));
+ XKMSMessageAbstractTypeImpl * m =
+ (XKMSMessageAbstractTypeImpl *) m_factory.newMessageFromDOM(e);
+ m_resultList.push_back((XKMSResultTypeImpl *) m);
}
@@ -138,7 +139,7 @@
XKMSMessageAbstractType::messageType XKMSCompoundResultImpl::getMessageType(void) {
- return XKMSMessageAbstractType::CompoundResult;
+ return XKMSMessageAbstractTypeImpl::CompoundResult;
}
@@ -172,7 +173,7 @@
const XMLCh * id) {
XKMSLocateResult * r = m_factory.createLocateResult(request, mp_env->getParentDocument(), rmaj, rmin, id);
- m_resultList.push_back(dynamic_cast<XKMSResultTypeImpl*>(r));
+ m_resultList.push_back((XKMSResultTypeImpl*) r);
mp_messageAbstractTypeElement->appendChild(r->getElement());
mp_env->doPrettyPrint(mp_messageAbstractTypeElement);
@@ -188,7 +189,7 @@
const XMLCh * id) {
XKMSValidateResult * r = m_factory.createValidateResult(request, mp_env->getParentDocument(), rmaj, rmin, id);
- m_resultList.push_back(dynamic_cast<XKMSResultTypeImpl*>(r));
+ m_resultList.push_back((XKMSResultTypeImpl*) r);
mp_messageAbstractTypeElement->appendChild(r->getElement());
mp_env->doPrettyPrint(mp_messageAbstractTypeElement);
@@ -204,7 +205,7 @@
const XMLCh * id) {
XKMSStatusResult * r = m_factory.createStatusResult(request, mp_env->getParentDocument(), rmaj, rmin, id);
- m_resultList.push_back(dynamic_cast<XKMSResultTypeImpl*>(r));
+ m_resultList.push_back((XKMSResultTypeImpl*) r);
mp_messageAbstractTypeElement->appendChild(r->getElement());
mp_env->doPrettyPrint(mp_messageAbstractTypeElement);
@@ -220,7 +221,7 @@
const XMLCh * id) {
XKMSRegisterResult * r = m_factory.createRegisterResult(request, mp_env->getParentDocument(), rmaj, rmin, id);
- m_resultList.push_back(dynamic_cast<XKMSResultTypeImpl*>(r));
+ m_resultList.push_back((XKMSResultTypeImpl*) r);
mp_messageAbstractTypeElement->appendChild(r->getElement());
mp_env->doPrettyPrint(mp_messageAbstractTypeElement);
@@ -236,7 +237,7 @@
const XMLCh * id) {
XKMSResult * r = m_factory.createResult(request, mp_env->getParentDocument(), rmaj, rmin, id);
- m_resultList.push_back(dynamic_cast<XKMSResultTypeImpl*>(r));
+ m_resultList.push_back((XKMSResultTypeImpl*) r);
mp_messageAbstractTypeElement->appendChild(r->getElement());
mp_env->doPrettyPrint(mp_messageAbstractTypeElement);
1.5 +2 -2 xml-security/c/src/xkms/impl/XKMSLocateRequestImpl.cpp
Index: XKMSLocateRequestImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSLocateRequestImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XKMSLocateRequestImpl.cpp 3 Feb 2005 14:30:30 -0000 1.4
+++ XKMSLocateRequestImpl.cpp 26 Feb 2005 03:17:08 -0000 1.5
@@ -125,7 +125,7 @@
XKMSMessageAbstractType::messageType XKMSLocateRequestImpl::getMessageType(void) {
- return XKMSMessageAbstractType::LocateRequest;
+ return XKMSMessageAbstractTypeImpl::LocateRequest;
}
1.3 +2 -2 xml-security/c/src/xkms/impl/XKMSLocateResultImpl.cpp
Index: XKMSLocateResultImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSLocateResultImpl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XKMSLocateResultImpl.cpp 3 Feb 2005 14:30:30 -0000 1.2
+++ XKMSLocateResultImpl.cpp 26 Feb 2005 03:17:08 -0000 1.3
@@ -133,7 +133,7 @@
XKMSMessageAbstractType::messageType XKMSLocateResultImpl::getMessageType(void) {
- return XKMSMessageAbstractType::LocateResult;
+ return XKMSMessageAbstractTypeImpl::LocateResult;
}
1.7 +2 -2 xml-security/c/src/xkms/impl/XKMSMessageAbstractTypeImpl.hpp
Index: XKMSMessageAbstractTypeImpl.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSMessageAbstractTypeImpl.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XKMSMessageAbstractTypeImpl.hpp 3 Feb 2005 14:30:30 -0000 1.6
+++ XKMSMessageAbstractTypeImpl.hpp 26 Feb 2005 03:17:08 -0000 1.7
@@ -38,7 +38,7 @@
XSEC_DECLARE_XERCES_CLASS(DOMElement);
XSEC_DECLARE_XERCES_CLASS(DOMAttr);
-class XKMSMessageAbstractTypeImpl : virtual public XKMSMessageAbstractType {
+class XKMSMessageAbstractTypeImpl : public XKMSMessageAbstractType {
public:
1.18 +43 -59 xml-security/c/src/xkms/impl/XKMSMessageFactoryImpl.cpp
Index: XKMSMessageFactoryImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSMessageFactoryImpl.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XKMSMessageFactoryImpl.cpp 3 Feb 2005 14:30:30 -0000 1.17
+++ XKMSMessageFactoryImpl.cpp 26 Feb 2005 03:17:08 -0000 1.18
@@ -164,7 +164,7 @@
ret->load();
- return ret;
+ return (XKMSCompoundRequest*) ret;
}
@@ -176,7 +176,7 @@
ret->load();
- return ret;
+ return (XKMSCompoundRequest*) ret;
}
@@ -188,7 +188,7 @@
ret->load();
- return ret;
+ return (XKMSLocateRequest *) ret;
}
@@ -200,7 +200,7 @@
ret->load();
- return ret;
+ return (XKMSValidateRequest *) ret;
}
@@ -214,7 +214,7 @@
ret->load();
j_ret.release();
- return ret;
+ return (XKMSLocateResult *) ret;
}
@@ -228,7 +228,7 @@
ret->load();
j_ret.release();
- return ret;
+ return (XKMSValidateResult *) ret;
}
@@ -242,7 +242,7 @@
ret->load();
j_ret.release();
- return ret;
+ return (XKMSResult *) ret;
}
@@ -256,7 +256,7 @@
ret->load();
j_ret.release();
- return ret;
+ return (XKMSPendingRequest *) ret;
}
@@ -270,7 +270,7 @@
ret->load();
j_ret.release();
- return ret;
+ return (XKMSStatusRequest *) ret;
}
@@ -284,7 +284,7 @@
ret->load();
j_ret.release();
- return ret;
+ return (XKMSStatusResult *) ret;
}
@@ -298,7 +298,7 @@
ret->load();
j_ret.release();
- return ret;
+ return (XKMSRegisterRequest *) ret;
}
@@ -312,7 +312,7 @@
ret->load();
j_ret.release();
- return ret;
+ return (XKMSRegisterResult *) ret;
}
@@ -838,58 +838,42 @@
XKMSRequestAbstractType * XKMSMessageFactoryImpl::toRequestAbstractType(XKMSMessageAbstractType *msg) {
- if (msg->getMessageType() == XKMSMessageAbstractType::LocateRequest) {
- XKMSLocateRequest * lr = dynamic_cast<XKMSLocateRequest*>(msg);
- return lr;
- }
- if (msg->getMessageType() == XKMSMessageAbstractType::ValidateRequest) {
- XKMSValidateRequest * vr = dynamic_cast<XKMSValidateRequest*>(msg);
- return vr;
- }
- if (msg->getMessageType() == XKMSMessageAbstractType::CompoundRequest) {
- XKMSCompoundRequest * cr = dynamic_cast<XKMSCompoundRequest*>(msg);
- return cr;
- }
- if (msg->getMessageType() == XKMSMessageAbstractType::PendingRequest) {
- XKMSPendingRequest * pr = dynamic_cast<XKMSPendingRequest*>(msg);
- return pr;
- }
- if (msg->getMessageType() == XKMSMessageAbstractType::RegisterRequest) {
- XKMSRegisterRequest * rr = dynamic_cast<XKMSRegisterRequest*>(msg);
- return rr;
- }
- if (msg->getMessageType() == XKMSMessageAbstractType::StatusRequest) {
- XKMSStatusRequest * sr = dynamic_cast<XKMSStatusRequest*>(msg);
- return sr;
+
+ switch (msg->getMessageType()) {
+
+ case XKMSMessageAbstractType::LocateRequest :
+ case XKMSMessageAbstractType::ValidateRequest :
+ case XKMSMessageAbstractType::CompoundRequest :
+ case XKMSMessageAbstractType::PendingRequest :
+ case XKMSMessageAbstractType::RegisterRequest :
+ case XKMSMessageAbstractType::StatusRequest :
+
+ return (XKMSRequestAbstractType *) msg;
+
+ default:
+
+ return NULL;
}
+
return NULL;
+
}
XKMSResultType * XKMSMessageFactoryImpl::toResultType(XKMSMessageAbstractType *msg) {
- if (msg->getMessageType() == XKMSMessageAbstractType::LocateResult) {
- XKMSLocateResult * lr = dynamic_cast<XKMSLocateResult*>(msg);
- return lr;
- }
- if (msg->getMessageType() == XKMSMessageAbstractType::ValidateResult) {
- XKMSValidateResult * vr = dynamic_cast<XKMSValidateResult*>(msg);
- return vr;
- }
- if (msg->getMessageType() == XKMSMessageAbstractType::CompoundResult) {
- XKMSCompoundResult * cr = dynamic_cast<XKMSCompoundResult*>(msg);
- return cr;
- }
- if (msg->getMessageType() == XKMSMessageAbstractType::RegisterResult) {
- XKMSRegisterResult * rr = dynamic_cast<XKMSRegisterResult*>(msg);
- return rr;
- }
- if (msg->getMessageType() == XKMSMessageAbstractType::StatusResult) {
- XKMSStatusResult * sr = dynamic_cast<XKMSStatusResult*>(msg);
- return sr;
- }
- if (msg->getMessageType() == XKMSMessageAbstractType::Result) {
- XKMSResult * r = dynamic_cast<XKMSResult*>(msg);
- return r;
+ switch (msg->getMessageType()) {
+
+ case XKMSMessageAbstractType::LocateResult :
+ case XKMSMessageAbstractType::ValidateResult :
+ case XKMSMessageAbstractType::CompoundResult :
+ case XKMSMessageAbstractType::RegisterResult :
+ case XKMSMessageAbstractType::StatusResult :
+ case XKMSMessageAbstractType::Result :
+
+ return (XKMSResultType *) msg;
+
+ default:
+ return NULL;
}
return NULL;
}
1.3 +2 -2 xml-security/c/src/xkms/impl/XKMSPendingRequestImpl.cpp
Index: XKMSPendingRequestImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSPendingRequestImpl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XKMSPendingRequestImpl.cpp 3 Feb 2005 14:30:30 -0000 1.2
+++ XKMSPendingRequestImpl.cpp 26 Feb 2005 03:17:08 -0000 1.3
@@ -115,7 +115,7 @@
XKMSMessageAbstractType::messageType XKMSPendingRequestImpl::getMessageType(void) {
- return XKMSMessageAbstractType::PendingRequest;
+ return XKMSMessageAbstractTypeImpl::PendingRequest;
}
1.4 +2 -2 xml-security/c/src/xkms/impl/XKMSRegisterRequestImpl.cpp
Index: XKMSRegisterRequestImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSRegisterRequestImpl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XKMSRegisterRequestImpl.cpp 3 Feb 2005 14:30:30 -0000 1.3
+++ XKMSRegisterRequestImpl.cpp 26 Feb 2005 03:17:08 -0000 1.4
@@ -195,7 +195,7 @@
XKMSMessageAbstractType::messageType XKMSRegisterRequestImpl::getMessageType(void) {
- return XKMSMessageAbstractType::RegisterRequest;
+ return XKMSMessageAbstractTypeImpl::RegisterRequest;
}
1.3 +2 -2 xml-security/c/src/xkms/impl/XKMSRegisterResultImpl.cpp
Index: XKMSRegisterResultImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSRegisterResultImpl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XKMSRegisterResultImpl.cpp 3 Feb 2005 14:30:30 -0000 1.2
+++ XKMSRegisterResultImpl.cpp 26 Feb 2005 03:17:08 -0000 1.3
@@ -133,7 +133,7 @@
XKMSMessageAbstractType::messageType XKMSRegisterResultImpl::getMessageType(void) {
- return XKMSMessageAbstractType::RegisterResult;
+ return XKMSMessageAbstractTypeImpl::RegisterResult;
}
1.9 +2 -2 xml-security/c/src/xkms/impl/XKMSRequestAbstractTypeImpl.hpp
Index: XKMSRequestAbstractTypeImpl.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSRequestAbstractTypeImpl.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XKMSRequestAbstractTypeImpl.hpp 3 Feb 2005 14:30:30 -0000 1.8
+++ XKMSRequestAbstractTypeImpl.hpp 26 Feb 2005 03:17:08 -0000 1.9
@@ -38,7 +38,7 @@
class XKMSRespondWithImpl;
class XKMSResponseMechanismImpl;
-class XKMSRequestAbstractTypeImpl : virtual public XKMSRequestAbstractType, public XKMSMessageAbstractTypeImpl {
+class XKMSRequestAbstractTypeImpl : public XKMSRequestAbstractType, public XKMSMessageAbstractTypeImpl {
public:
1.3 +2 -2 xml-security/c/src/xkms/impl/XKMSResultImpl.cpp
Index: XKMSResultImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSResultImpl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XKMSResultImpl.cpp 3 Feb 2005 14:30:30 -0000 1.2
+++ XKMSResultImpl.cpp 26 Feb 2005 03:17:08 -0000 1.3
@@ -106,7 +106,7 @@
XKMSMessageAbstractType::messageType XKMSResultImpl::getMessageType(void) {
- return XKMSMessageAbstractType::Result;
+ return XKMSMessageAbstractTypeImpl::Result;
}
1.5 +2 -2 xml-security/c/src/xkms/impl/XKMSStatusRequestImpl.cpp
Index: XKMSStatusRequestImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSStatusRequestImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XKMSStatusRequestImpl.cpp 3 Feb 2005 14:30:30 -0000 1.4
+++ XKMSStatusRequestImpl.cpp 26 Feb 2005 03:17:08 -0000 1.5
@@ -115,7 +115,7 @@
XKMSMessageAbstractType::messageType XKMSStatusRequestImpl::getMessageType(void) {
- return XKMSMessageAbstractType::StatusRequest;
+ return XKMSMessageAbstractTypeImpl::StatusRequest;
}
1.3 +2 -2 xml-security/c/src/xkms/impl/XKMSStatusResultImpl.cpp
Index: XKMSStatusResultImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSStatusResultImpl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XKMSStatusResultImpl.cpp 3 Feb 2005 14:30:30 -0000 1.2
+++ XKMSStatusResultImpl.cpp 26 Feb 2005 03:17:08 -0000 1.3
@@ -114,7 +114,7 @@
XKMSMessageAbstractType::messageType XKMSStatusResultImpl::getMessageType(void) {
- return XKMSMessageAbstractType::StatusResult;
+ return XKMSMessageAbstractTypeImpl::StatusResult;
}
1.3 +2 -2 xml-security/c/src/xkms/impl/XKMSValidateRequestImpl.cpp
Index: XKMSValidateRequestImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSValidateRequestImpl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XKMSValidateRequestImpl.cpp 3 Feb 2005 14:30:30 -0000 1.2
+++ XKMSValidateRequestImpl.cpp 26 Feb 2005 03:17:08 -0000 1.3
@@ -125,7 +125,7 @@
XKMSMessageAbstractType::messageType XKMSValidateRequestImpl::getMessageType(void) {
- return XKMSMessageAbstractType::ValidateRequest;
+ return XKMSMessageAbstractTypeImpl::ValidateRequest;
}
1.4 +2 -2 xml-security/c/src/xkms/impl/XKMSValidateResultImpl.cpp
Index: XKMSValidateResultImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xkms/impl/XKMSValidateResultImpl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XKMSValidateResultImpl.cpp 3 Feb 2005 14:30:30 -0000 1.3
+++ XKMSValidateResultImpl.cpp 26 Feb 2005 03:17:08 -0000 1.4
@@ -133,7 +133,7 @@
XKMSMessageAbstractType::messageType XKMSValidateResultImpl::getMessageType(void) {
- return XKMSMessageAbstractType::ValidateResult;
+ return XKMSMessageAbstractTypeImpl::ValidateResult;
}