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 2004/11/04 12:07:05 UTC
cvs commit: xml-security/c/src/xkms/impl XKMSMessageFactoryImpl.cpp XKMSStatusRequestImpl.cpp
blautenb 2004/11/04 03:07:05
Modified: c/Projects/VC6.0/xsec/xsec_lib xsec_lib.dsp
c/src/enc/OpenSSL OpenSSLCryptoProvider.cpp
c/src/tools/xklient xklient.cpp
c/src/xkms/impl XKMSMessageFactoryImpl.cpp
XKMSStatusRequestImpl.cpp
Log:
StatusRequest minor bugfix
Revision Changes Path
1.40 +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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xsec_lib.dsp 29 Oct 2004 23:16:01 -0000 1.39
+++ xsec_lib.dsp 4 Nov 2004 11:07:04 -0000 1.40
@@ -1200,10 +1200,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\src\xkms\XKMSRegisterResult.hpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\src\xkms\impl\XKMSRegisterResultImpl.cpp
# End Source File
# Begin Source File
@@ -1378,6 +1374,10 @@
# Begin Source File
SOURCE=..\..\..\..\src\xkms\XKMSRegisterRequest.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\xkms\XKMSRegisterResult.hpp
# End Source File
# Begin Source File
1.15 +8 -1 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoProvider.cpp
Index: OpenSSLCryptoProvider.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoProvider.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- OpenSSLCryptoProvider.cpp 22 Oct 2004 00:01:59 -0000 1.14
+++ OpenSSLCryptoProvider.cpp 4 Nov 2004 11:07:04 -0000 1.15
@@ -40,6 +40,8 @@
#include <xsec/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp>
#include <xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp>
+#include <xsec/enc/XSCrypt/XSCryptCryptoBase64.hpp>
+
#include <xsec/enc/XSECCryptoException.hpp>
#include <openssl/rand.h>
@@ -152,10 +154,15 @@
XSECCryptoBase64 * OpenSSLCryptoProvider::base64() {
+#if 0
OpenSSLCryptoBase64 * ret;
XSECnew(ret, OpenSSLCryptoBase64());
+#else
+ XSCryptCryptoBase64 *ret;
+ XSECnew(ret, XSCryptCryptoBase64);
+#endif
return ret;
}
1.25 +6 -5 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xklient.cpp 29 Oct 2004 23:16:02 -0000 1.24
+++ xklient.cpp 4 Nov 2004 11:07:04 -0000 1.25
@@ -1277,14 +1277,14 @@
void printPendingRequestUsage(void) {
- cerr << "\nUsage PendingRequest [--help|-h] <service URI> <OriginalRequestId> <ResponseId>\n";
+ cerr << "\nUsage PendingRequest [--help|-h] <service URI> <OriginalRequestId> [ResponseId]\n";
cerr << " --help/-h : print this screen and exit\n\n";
}
XKMSMessageAbstractType * createPendingRequest(XSECProvider &prov, DOMDocument **doc, int argc, char ** argv, int paramCount) {
- if (paramCount +2 >= argc ||
+ if (paramCount +1 >= argc ||
(stricmp(argv[paramCount], "--help") == 0) ||
(stricmp(argv[paramCount], "-h") == 0)) {
@@ -1299,7 +1299,8 @@
factory->createPendingRequest(MAKE_UNICODE_STRING(argv[paramCount++]), doc);
pr->setOriginalRequestId(MAKE_UNICODE_STRING(argv[paramCount++]));
- pr->setResponseId(MAKE_UNICODE_STRING(argv[paramCount++]));
+ if (paramCount != argc)
+ pr->setResponseId(MAKE_UNICODE_STRING(argv[paramCount++]));
return pr;
}
@@ -1317,7 +1318,7 @@
XKMSMessageAbstractType * createStatusRequest(XSECProvider &prov, DOMDocument **doc, int argc, char ** argv, int paramCount) {
- if (paramCount +2 >= argc ||
+ if (paramCount +1 >= argc ||
(stricmp(argv[paramCount], "--help") == 0) ||
(stricmp(argv[paramCount], "-h") == 0)) {
1.14 +9 -1 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XKMSMessageFactoryImpl.cpp 29 Oct 2004 23:16:02 -0000 1.13
+++ XKMSMessageFactoryImpl.cpp 4 Nov 2004 11:07:04 -0000 1.14
@@ -858,6 +858,10 @@
XKMSRegisterRequest * rr = dynamic_cast<XKMSRegisterRequest*>(msg);
return rr;
}
+ if (msg->getMessageType() == XKMSMessageAbstractType::StatusRequest) {
+ XKMSStatusRequest * sr = dynamic_cast<XKMSStatusRequest*>(msg);
+ return sr;
+ }
return NULL;
}
@@ -878,6 +882,10 @@
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;
}
return NULL;
}
1.2 +1 -6 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XKMSStatusRequestImpl.cpp 3 Oct 2004 12:20:06 -0000 1.1
+++ XKMSStatusRequestImpl.cpp 4 Nov 2004 11:07:04 -0000 1.2
@@ -88,11 +88,6 @@
mp_responseIdAttr =
mp_messageAbstractTypeElement->getAttributeNodeNS(NULL, XKMSConstants::s_tagResponseId);
- if (mp_responseIdAttr == NULL) {
- // Attempt to load an empty element
- throw XSECException(XSECException::ExpectedXKMSChildNotFound,
- "XKMSStatusRequest::load - No ResponseId attribute found");
- }
}
// --------------------------------------------------------------------------------