[xmlsec] remove xkms support

From: Aleksey Sanin <aleksey src gnome org>
To: commits-list gnome org
Cc:
Subject: [xmlsec] remove xkms support
Date: Wed, 25 Feb 2015 19:10:31 +0000 (UTC)
commit 95c29dc742804b06ce99427c68422b52afd3d719
Author: Aleksey Sanin <aleksey aleksey com>
Date:   Wed Feb 25 10:57:43 2015 -0800

    remove xkms support

 ChangeLog                                          |    3 +
 Makefile.am                                        |   10 -
 apps/xmlsec.c                                      |  280 +--
 configure.in                                       |   16 -
 docs/api/Makefile.am                               |    4 +-
 docs/api/sgml/xkms.sgml                            |   44 -
 docs/api/tmpl/xkms.sgml                            |   16 -
 examples/Makefile                                  |    3 +-
 examples/Makefile.w32                              |    1 -
 examples/xkms-server.c                             |  839 ----
 include/xmlsec/Makefile.am                         |    1 -
 include/xmlsec/private/Makefile.am                 |    1 -
 include/xmlsec/private/xkms.h                      |  121 -
 include/xmlsec/strings.h                           |  122 -
 include/xmlsec/xkms.h                              |  652 ---
 include/xmlsec/xmlsec.h                            |    4 -
 src/Makefile.am                                    |    1 -
 src/strings.c                                      |  121 -
 src/xkms.c                                         | 4981 --------------------
 src/xmlsec.c                                       |   25 +-
 .../bad-request-name-not-supported.xml             |    2 -
 tests/aleksey-xkms-01/bad-request-name.xml         |   10 -
 .../compound-example-1-no-match.xml                |    7 -
 tests/aleksey-xkms-01/compound-example-1.xml       |   51 -
 tests/aleksey-xkms-01/keys/cert1.der               |  Bin 1137 -> 0 bytes
 tests/aleksey-xkms-01/keys/cert1.pem               |   26 -
 tests/aleksey-xkms-01/keys/cert2.der               |  Bin 1065 -> 0 bytes
 tests/aleksey-xkms-01/keys/cert2.pem               |   25 -
 tests/aleksey-xkms-01/keys/cert3.der               |  Bin 1041 -> 0 bytes
 tests/aleksey-xkms-01/keys/cert3.pem               |   24 -
 tests/aleksey-xkms-01/keys/create-keys.sh          |   73 -
 tests/aleksey-xkms-01/keys/key1-pk8.der            |  Bin 677 -> 0 bytes
 tests/aleksey-xkms-01/keys/key1.der                |  Bin 608 -> 0 bytes
 tests/aleksey-xkms-01/keys/key1.p12                |  Bin 2206 -> 0 bytes
 tests/aleksey-xkms-01/keys/key1.pem                |   18 -
 tests/aleksey-xkms-01/keys/key2-pk8.der            |  Bin 389 -> 0 bytes
 tests/aleksey-xkms-01/keys/key2.der                |  Bin 320 -> 0 bytes
 tests/aleksey-xkms-01/keys/key2.p12                |  Bin 1846 -> 0 bytes
 tests/aleksey-xkms-01/keys/key2.pem                |    9 -
 tests/aleksey-xkms-01/keys/key3-pk8.der            |  Bin 389 -> 0 bytes
 tests/aleksey-xkms-01/keys/key3.der                |  Bin 318 -> 0 bytes
 tests/aleksey-xkms-01/keys/key3.p12                |  Bin 1822 -> 0 bytes
 tests/aleksey-xkms-01/keys/key3.pem                |    9 -
 tests/aleksey-xkms-01/keys/openssl.cnf             |  106 -
 tests/aleksey-xkms-01/keys/req2.pem                |   11 -
 tests/aleksey-xkms-01/keys/req3.pem                |   11 -
 .../locate-example-1-bad-service.xml               |    2 -
 .../aleksey-xkms-01/locate-example-1-no-match.xml  |    2 -
 tests/aleksey-xkms-01/locate-example-1.xml         |   18 -
 .../aleksey-xkms-01/locate-example-2-no-match.xml  |    2 -
 tests/aleksey-xkms-01/locate-example-2.xml         |   39 -
 .../locate-opaque-client-data-no-match.xml         |    2 -
 .../aleksey-xkms-01/locate-opaque-client-data.xml  |   32 -
 tests/aleksey-xkms-01/readme.txt                   |  117 -
 .../soap11-bad-request-name-msg-invalid.xml        |    9 -
 tests/aleksey-xkms-01/soap11-bad-request-name.xml  |   14 -
 .../soap11-locate-example-1-no-match.xml           |    6 -
 .../soap11-locate-example-1-unsupported.xml        |   13 -
 tests/aleksey-xkms-01/soap11-locate-example-1.xml  |   23 -
 .../soap12-bad-request-name-msg-invalid.xml        |   11 -
 tests/aleksey-xkms-01/soap12-bad-request-name.xml  |   14 -
 .../soap12-locate-example-1-no-match.xml           |    6 -
 .../soap12-locate-example-1-unsupported.xml        |    9 -
 tests/aleksey-xkms-01/soap12-locate-example-1.xml  |   23 -
 tests/aleksey-xkms-01/status-request-success.xml   |    2 -
 tests/aleksey-xkms-01/status-request.xml           |    7 -
 .../validate-example-1-no-match.xml                |    2 -
 tests/aleksey-xkms-01/validate-example-1.xml       |   65 -
 tests/testXKMS.sh                                  |  129 -
 tests/testrun.sh                                   |   68 -
 win32/Makefile.msvc                                |    9 -
 71 files changed, 17 insertions(+), 8234 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2bd755e..9a0c7e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-02-25 Aleksey Sanin  <aleksey aleksey com>
+       * Removed XKMS support -- it was never completed and not worth keeping
+
 2013-05-23 Aleksey Sanin  <aleksey aleksey com>
         * 1.2.20 release
         
diff --git a/Makefile.am b/Makefile.am
index 669f996..03f2083 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -150,16 +150,6 @@ check-enc: $(TEST_APP)
            der \
        )
 
-check-xkms: $(TEST_APP)        
-       @($(PRECHECK_COMMANDS) && \
-       $(SHELL) ./tests/testrun.sh \
-           $(ABS_SRCDIR)/tests/testXKMS.sh \
-           $(DEFAULT_CRYPTO) \
-           $(ABS_SRCDIR)/tests \
-           $(ABS_BUILDDIR)/$(TEST_APP) \
-           der \
-       )
-
 memcheck-res:
        @grep -i 'ERROR SUMMARY' /tmp/*.log | sed 's/.*==.*== *//' | sort -u
        @grep -i 'in use at exit' /tmp/*.log | sed 's/.*==.*== *//' | sort -u
diff --git a/apps/xmlsec.c b/apps/xmlsec.c
index c9e5534..bd4faa7 100644
--- a/apps/xmlsec.c
+++ b/apps/xmlsec.c
@@ -36,7 +36,6 @@
 #include <xmlsec/transforms.h>
 #include <xmlsec/xmldsig.h>
 #include <xmlsec/xmlenc.h>
-#include <xmlsec/xkms.h>
 #include <xmlsec/parser.h>
 #include <xmlsec/templates.h>
 #include <xmlsec/errors.h>
@@ -75,9 +74,6 @@ static const char helpCommands2[] =
     "  --encrypt   "    "\tencrypt data and output XML document\n"
     "  --decrypt   "    "\tdecrypt data from XML document\n"
 #endif /* XMLSEC_NO_XMLENC */
-#ifndef XMLSEC_NO_XKMS
-    "  --xkms-server-request ""\tprocess data as XKMS server request\n"
-#endif /* XMLSEC_NO_XKMS */
     ;
 
 static const char helpVersion[] = 
@@ -113,10 +109,6 @@ static const char helpDecrypt[] =
     "Usage: xmlsec decrypt [<options>] <file>\n"
     "Decrypts XML Encryption data in the <file>\n";
 
-static const char helpXkmsServerRequest[] =  
-    "Usage: xmlsec xkms-server-request [<options>] <file>\n"
-    "Processes the <file> as XKMS server request and outputs the response\n";
-
 static const char helpListKeyData[] =     
     "Usage: xmlsec list-key-data\n"
     "Prints the list of known key data klasses\n";
@@ -140,7 +132,7 @@ static const char helpCheckTransforms[] =
 #define xmlSecAppCmdLineTopicEncCommon          0x0010
 #define xmlSecAppCmdLineTopicEncEncrypt         0x0020
 #define xmlSecAppCmdLineTopicEncDecrypt         0x0040
-#define xmlSecAppCmdLineTopicXkmsCommon         0x0080
+// #define UNUSED         0x0080
 #define xmlSecAppCmdLineTopicKeysMngr           0x1000
 #define xmlSecAppCmdLineTopicX509Certs          0x2000
 #define xmlSecAppCmdLineTopicVersion            0x4000
@@ -419,8 +411,7 @@ static xmlSecAppCmdLineParam sessionKeyParam = {
 
 static xmlSecAppCmdLineParam outputParam = { 
     xmlSecAppCmdLineTopicDSigCommon | 
-    xmlSecAppCmdLineTopicEncCommon | 
-    xmlSecAppCmdLineTopicXkmsCommon,
+    xmlSecAppCmdLineTopicEncCommon,
     "--output",
     "-o",
     "--output <filename>"
@@ -432,8 +423,7 @@ static xmlSecAppCmdLineParam outputParam = {
 
 static xmlSecAppCmdLineParam nodeIdParam = { 
     xmlSecAppCmdLineTopicDSigCommon | 
-    xmlSecAppCmdLineTopicEncCommon | 
-    xmlSecAppCmdLineTopicXkmsCommon,
+    xmlSecAppCmdLineTopicEncCommon,
     "--node-id",
     NULL,
     "--node-id <id>"
@@ -445,8 +435,7 @@ static xmlSecAppCmdLineParam nodeIdParam = {
 
 static xmlSecAppCmdLineParam nodeNameParam = { 
     xmlSecAppCmdLineTopicDSigCommon | 
-    xmlSecAppCmdLineTopicEncCommon | 
-    xmlSecAppCmdLineTopicXkmsCommon,
+    xmlSecAppCmdLineTopicEncCommon,
     "--node-name",
     NULL,   
     "--node-name [<namespace-uri>:]<name>"
@@ -459,8 +448,7 @@ static xmlSecAppCmdLineParam nodeNameParam = {
     
 static xmlSecAppCmdLineParam nodeXPathParam = { 
     xmlSecAppCmdLineTopicDSigCommon | 
-    xmlSecAppCmdLineTopicEncCommon | 
-    xmlSecAppCmdLineTopicXkmsCommon,
+    xmlSecAppCmdLineTopicEncCommon,
     "--node-xpath",
     NULL,   
     "--node-xpath <expr>"
@@ -473,8 +461,7 @@ static xmlSecAppCmdLineParam nodeXPathParam = {
 
 static xmlSecAppCmdLineParam dtdFileParam = { 
     xmlSecAppCmdLineTopicDSigCommon | 
-    xmlSecAppCmdLineTopicEncCommon | 
-    xmlSecAppCmdLineTopicXkmsCommon,
+    xmlSecAppCmdLineTopicEncCommon,
     "--dtd-file",
     NULL,   
     "--dtd-file <file>"
@@ -486,8 +473,7 @@ static xmlSecAppCmdLineParam dtdFileParam = {
 
 static xmlSecAppCmdLineParam printDebugParam = { 
     xmlSecAppCmdLineTopicDSigCommon | 
-    xmlSecAppCmdLineTopicEncCommon | 
-    xmlSecAppCmdLineTopicXkmsCommon,
+    xmlSecAppCmdLineTopicEncCommon,
     "--print-debug",
     NULL,   
     "--print-debug"
@@ -499,8 +485,7 @@ static xmlSecAppCmdLineParam printDebugParam = {
 
 static xmlSecAppCmdLineParam printXmlDebugParam = { 
     xmlSecAppCmdLineTopicDSigCommon | 
-    xmlSecAppCmdLineTopicEncCommon | 
-    xmlSecAppCmdLineTopicXkmsCommon,
+    xmlSecAppCmdLineTopicEncCommon,
     "--print-xml-debug",
     NULL,   
     "--print-xml-debug"
@@ -512,8 +497,7 @@ static xmlSecAppCmdLineParam printXmlDebugParam = {
 
 static xmlSecAppCmdLineParam idAttrParam = { 
     xmlSecAppCmdLineTopicDSigCommon | 
-    xmlSecAppCmdLineTopicEncCommon | 
-    xmlSecAppCmdLineTopicXkmsCommon,
+    xmlSecAppCmdLineTopicEncCommon,
     "--id-attr",
     NULL,   
     "--id-attr[:<attr-name>] [<node-namespace-uri>:]<node-name>"
@@ -641,72 +625,6 @@ static xmlSecAppCmdLineParam xmlDataParam = {
 };
 #endif /* XMLSEC_NO_XMLENC */
 
-/****************************************************************
- *
- * XKMS params
- *
- ***************************************************************/
-#ifndef XMLSEC_NO_XKMS
-static xmlSecAppCmdLineParam xkmsServiceParam = { 
-    xmlSecAppCmdLineTopicXkmsCommon,
-    "--xkms-service",
-    NULL,
-    "--xkms-service <uri>"
-    "\n\tsets XKMS \"Service\" <uri>",
-    xmlSecAppCmdLineParamTypeString,
-    xmlSecAppCmdLineParamFlagNone,
-    NULL
-};
-
-static xmlSecAppCmdLineParam xkmsFormatParam = { 
-    xmlSecAppCmdLineTopicXkmsCommon,
-    "--xkms-format",
-    NULL,
-    "--xkms-format <format>"
-    "\n\tsets the XKMS request/response format to one of the following values:"
-    "\n\t  \"plain\" (default), \"soap-1.1\" or \"soap-1.2\"",
-    xmlSecAppCmdLineParamTypeString,
-    xmlSecAppCmdLineParamFlagNone,
-    NULL
-};
-
-static xmlSecAppCmdLineParam xkmsStopUnknownResponseMechanismParam = { 
-    xmlSecAppCmdLineTopicXkmsCommon, /* todo: server */
-    "--xkms-stop-on-unknown-response-mechanism",
-    NULL,
-    "--xkms-stop-on-unknown-response-mechanism"
-    "\n\tstop processing XKMS server request if unknown ResponseMechanism"
-    "\n\tvalue was found",
-    xmlSecAppCmdLineParamTypeFlag,
-    xmlSecAppCmdLineParamFlagNone,
-    NULL
-};
-
-static xmlSecAppCmdLineParam xkmsStopUnknownRespondWithParam = { 
-    xmlSecAppCmdLineTopicXkmsCommon, /* todo: server */
-    "--xkms-stop-on-unknown-respond-with",
-    NULL,
-    "--xkms-stop-on-unknown-respond-with"
-    "\n\tstop processing XKMS server request if unknown RespondWith"
-    "\n\tvalue was found",
-    xmlSecAppCmdLineParamTypeFlag,
-    xmlSecAppCmdLineParamFlagNone,
-    NULL
-};
-
-static xmlSecAppCmdLineParam xkmsStopUnknownKeyUsageParam = { 
-    xmlSecAppCmdLineTopicXkmsCommon, /* todo: server */
-    "--xkms-stop-on-unknown-key-usage",
-    NULL,
-    "--xkms-stop-on-unknown-key-usage"
-    "\n\tstop processing XKMS server request if unknown KeyUsage"
-    "\n\tvalue was found",
-    xmlSecAppCmdLineParamTypeFlag,
-    xmlSecAppCmdLineParamFlagNone,
-    NULL
-};
-
-#endif /* XMLSEC_NO_XKMS */
 
 /****************************************************************
  *
@@ -842,15 +760,6 @@ static xmlSecAppCmdLineParamPtr parameters[] = {
     &xmlDataParam,
     &enabledCipherRefUrisParam,
 #endif /* XMLSEC_NO_XMLENC */
-
-    /* xkms params */
-#ifndef XMLSEC_NO_XKMS
-    &xkmsServiceParam,
-    &xkmsFormatParam,
-    &xkmsStopUnknownResponseMechanismParam,
-    &xkmsStopUnknownRespondWithParam,
-    &xkmsStopUnknownKeyUsageParam,
-#endif /* XMLSEC_NO_XKMS */
              
     /* common dsig and enc parameters */
     &sessionKeyParam,    
@@ -923,8 +832,7 @@ typedef enum {
     xmlSecAppCommandSignTmpl,
     xmlSecAppCommandEncrypt,
     xmlSecAppCommandDecrypt,
-    xmlSecAppCommandEncryptTmpl,
-    xmlSecAppCommandXkmsServerRequest
+    xmlSecAppCommandEncryptTmpl
 } xmlSecAppCommand;
 
 typedef struct _xmlSecAppXmlData                                xmlSecAppXmlData,
@@ -972,12 +880,6 @@ static int                      xmlSecAppPrepareEncCtx          (xmlSecEncCtxPtr
 static void                     xmlSecAppPrintEncCtx            (xmlSecEncCtxPtr encCtx);
 #endif /* XMLSEC_NO_XMLENC */
 
-#ifndef XMLSEC_NO_XKMS
-static int                      xmlSecAppXkmsServerProcess      (const char* filename);
-static int                      xmlSecAppPrepareXkmsServerCtx   (xmlSecXkmsServerCtxPtr xkmsServerCtx);
-static void                     xmlSecAppPrintXkmsServerCtx     (xmlSecXkmsServerCtxPtr xkmsServerCtx);
-#endif /* XMLSEC_NO_XKMS */
-
 static void                     xmlSecAppListKeyData            (void);
 static int                      xmlSecAppCheckKeyData       (const char * name);
 static void                     xmlSecAppListTransforms         (void);
@@ -1048,7 +950,6 @@ int main(int argc, const char **argv) {
         case xmlSecAppCommandVerify:
         case xmlSecAppCommandEncrypt:
         case xmlSecAppCommandDecrypt:
-        case xmlSecAppCommandXkmsServerRequest:
             if(pos >= argc) {
                 fprintf(stderr, "Error: <file> parameter is required for this command\n");
                 xmlSecAppPrintUsage();
@@ -1185,16 +1086,6 @@ int main(int argc, const char **argv) {
 #endif /* XMLSEC_NO_TMPL_TEST */
 #endif /* XMLSEC_NO_XMLENC */
 
-#ifndef XMLSEC_NO_XKMS
-        case xmlSecAppCommandXkmsServerRequest:
-            for(i = pos; i < argc; ++i) {
-                if(xmlSecAppXkmsServerProcess(argv[i]) < 0) {
-                    fprintf(stderr, "Error: failed to process XKMS server request from file \"%s\"\n", 
argv[i]);
-                    goto fail;
-                }
-            }
-            break;
-#endif /* XMLSEC_NO_XKMS */
         default:
             fprintf(stderr, "Error: invalid command %d\n", command);
             xmlSecAppPrintUsage();
@@ -1883,142 +1774,6 @@ xmlSecAppPrintEncCtx(xmlSecEncCtxPtr encCtx) {
 
 #endif /* XMLSEC_NO_XMLENC */
 
-#ifndef XMLSEC_NO_XKMS
-static int 
-xmlSecAppXkmsServerProcess(const char* filename) {
-    xmlSecAppXmlDataPtr data = NULL;
-    xmlDocPtr doc = NULL;
-    xmlNodePtr result;
-    xmlSecXkmsServerCtx xkmsServerCtx;
-    xmlSecXkmsServerFormat format = xmlSecXkmsServerFormatPlain;
-    clock_t start_time;
-    int res = -1;
-
-    if(filename == NULL) {
-        return(-1);
-    }
-
-    if(xmlSecXkmsServerCtxInitialize(&xkmsServerCtx, gKeysMngr) < 0) {
-        fprintf(stderr, "Error: XKMS server context initialization failed\n");
-        return(-1);
-    }
-    if(xmlSecAppPrepareXkmsServerCtx(&xkmsServerCtx) < 0) {
-        fprintf(stderr, "Error: XKMS server context preparation failed\n");
-        goto done;
-    }
-
-    /* get the input format */
-    if(xmlSecAppCmdLineParamGetString(&xkmsFormatParam) != NULL) {
-        format = xmlSecXkmsServerFormatFromString(BAD_CAST xmlSecAppCmdLineParamGetString(&xkmsFormatParam));
-        if(format == xmlSecXkmsServerFormatUnknown) {
-            fprintf(stderr, "Error: unknown format \"%s\"\n", 
-                    xmlSecAppCmdLineParamGetString(&xkmsFormatParam));
-            return(-1);    
-        }
-    }
-
-    /* parse template and select start node, there are multiple options
-     * for start node thus we don't provide the default start node name */
-    data = xmlSecAppXmlDataCreate(filename, NULL, NULL);
-    if(data == NULL) {
-        fprintf(stderr, "Error: failed to load request from file \"%s\"\n", filename);
-        goto done;
-    }
-
-    /* prepare result document */
-    doc = xmlNewDoc(BAD_CAST "1.0");
-    if(doc == NULL) {
-        fprintf(stderr, "Error: failed to create doc\n");
-        goto done;
-    }
-
-    start_time = clock();          
-    result = xmlSecXkmsServerCtxProcess(&xkmsServerCtx, data->startNode, format, doc);
-    if(result == NULL) {
-        fprintf(stderr, "Error: failed to process xkms server request\n");
-        goto done;
-    }
-    total_time += clock() - start_time;    
-
-        
-    /* print out result only once per execution */
-    xmlDocSetRootElement(doc, result);
-    if(repeats <= 1) {
-        if(xmlSecAppWriteResult(doc, NULL) < 0) {
-            goto done;
-        }
-    }
-
-    res = 0;    
-
-done:
-    /* print debug info if requested */
-    if(repeats <= 1) { 
-        xmlSecAppPrintXkmsServerCtx(&xkmsServerCtx);
-    }
-    xmlSecXkmsServerCtxFinalize(&xkmsServerCtx);
-
-    if(doc != NULL) {
-        xmlFreeDoc(doc);
-    }
-    if(data != NULL) {
-        xmlSecAppXmlDataDestroy(data);
-    }
-    return(res);
-}
-
-static int
-xmlSecAppPrepareXkmsServerCtx(xmlSecXkmsServerCtxPtr xkmsServerCtx) {    
-    if(xkmsServerCtx == NULL) {
-        fprintf(stderr, "Error: XKMS context is null\n");
-        return(-1);
-    }
-
-    /* set key info params */
-    if(xmlSecAppPrepareKeyInfoReadCtx(&(xkmsServerCtx->keyInfoReadCtx)) < 0) {
-        fprintf(stderr, "Error: failed to prepare key info context\n");
-        return(-1);
-    }
-
-    if(xmlSecAppCmdLineParamGetString(&xkmsServiceParam) != NULL) {
-        xkmsServerCtx->expectedService = xmlStrdup(BAD_CAST 
xmlSecAppCmdLineParamGetString(&xkmsServiceParam));
-        if(xkmsServerCtx->expectedService == NULL) {
-            fprintf(stderr, "Error: failed to duplicate string \"%s\"\n", 
-                    xmlSecAppCmdLineParamGetString(&xkmsServiceParam));
-            return(-1);    
-        }
-    }
-    
-    if(xmlSecAppCmdLineParamIsSet(&xkmsStopUnknownResponseMechanismParam)) {
-        xkmsServerCtx->flags |= XMLSEC_XKMS_SERVER_FLAGS_STOP_ON_UNKNOWN_RESPONSE_MECHANISM;
-    }
-    if(xmlSecAppCmdLineParamIsSet(&xkmsStopUnknownRespondWithParam)) {
-        xkmsServerCtx->flags |= XMLSEC_XKMS_SERVER_FLAGS_STOP_ON_UNKNOWN_RESPOND_WITH;
-    }
-    if(xmlSecAppCmdLineParamIsSet(&xkmsStopUnknownKeyUsageParam)) {
-        xkmsServerCtx->flags |= XMLSEC_XKMS_SERVER_FLAGS_STOP_ON_UNKNOWN_KEY_USAGE;
-    }
-    return(0);
-}
-
-static void 
-xmlSecAppPrintXkmsServerCtx(xmlSecXkmsServerCtxPtr xkmsServerCtx) {
-    if(xkmsServerCtx == NULL) {
-        return;
-    }
-    
-    /* print debug info if requested */
-    if((print_debug != 0) || xmlSecAppCmdLineParamIsSet(&printDebugParam)) {
-        xmlSecXkmsServerCtxDebugDump(xkmsServerCtx, stdout);
-    }
-    
-    if(xmlSecAppCmdLineParamIsSet(&printXmlDebugParam)) {          
-        xmlSecXkmsServerCtxDebugXmlDump(xkmsServerCtx, stdout);
-    }
-}
-
-#endif /* XMLSEC_NO_XKMS */
-
 static void 
 xmlSecAppListKeyData(void) {
     fprintf(stdout, "Registered key data klasses:\n");
@@ -2854,18 +2609,6 @@ xmlSecAppParseCommand(const char* cmd, xmlSecAppCmdLineParamTopic* cmdLineTopics
 #endif /* XMLSEC_NO_TMPL_TEST */
 #endif /* XMLSEC_NO_XMLENC */
 
-#ifndef XMLSEC_NO_XKMS
-    if(strcmp(cmd, "--xkms-server-request") == 0) {
-        (*cmdLineTopics) = 
-                        xmlSecAppCmdLineTopicGeneral |
-                        xmlSecAppCmdLineTopicCryptoConfig |
-                        xmlSecAppCmdLineTopicXkmsCommon |
-                        xmlSecAppCmdLineTopicKeysMngr |
-                        xmlSecAppCmdLineTopicX509Certs;
-        return(xmlSecAppCommandXkmsServerRequest);
-    } else
-#endif /* XMLSEC_NO_XKMS */
-
     if(1) {
         (*cmdLineTopics) = 0;
         return(xmlSecAppCommandUnknown);
@@ -2915,9 +2658,6 @@ xmlSecAppPrintHelp(xmlSecAppCommand command, xmlSecAppCmdLineParamTopic topics)
     case xmlSecAppCommandEncryptTmpl:
         fprintf(stdout, "%s\n", helpEncryptTmpl);
         break;
-    case xmlSecAppCommandXkmsServerRequest:
-        fprintf(stdout, "%s\n", helpXkmsServerRequest);
-        break;
     }
     if(topics != 0) {
         fprintf(stdout, "Options:\n");
diff --git a/configure.in b/configure.in
index 71f9106..7a68c52 100644
--- a/configure.in
+++ b/configure.in
@@ -1389,22 +1389,6 @@ AM_CONDITIONAL(XMLSEC_NO_XMLENC, test "z$XMLSEC_NO_XMLENC" = "z1")
 AC_SUBST(XMLSEC_NO_XMLENC)
 
 dnl ==========================================================================
-dnl See do we need XKMS support
-dnl ==========================================================================
-AC_MSG_CHECKING(for XMKMS support - under development, not stable yet) 
-AC_ARG_ENABLE(xkms,   [  --enable-xkms           enable XKMS support - under development (no)])
-if test "z$enable_xkms" = "zyes" ; then
-    XMLSEC_NO_XKMS="0"
-    AC_MSG_RESULT(yes)
-else
-    XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XKMS=1"
-    XMLSEC_NO_XKMS="1"
-    AC_MSG_RESULT(no)
-fi    
-AM_CONDITIONAL(XMLSEC_NO_XKMS, test "z$XMLSEC_NO_XKMS" = "z1")
-AC_SUBST(XMLSEC_NO_XKMS)
-
-dnl ==========================================================================
 dnl check if we need dynamic loading support
 dnl ==========================================================================
 XMLSEC_DL_INCLUDES=""
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index b92b533..2cc9703 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -19,8 +19,8 @@ EXTRA_DIST = \
 #
 DOC_SOURCE_DIR=./code
 DOC_SOURCE_FILES=\
-       $(shell find $(SOURCE_DIR) -name '*.c' -a ! -name "xkms*" -print )  \
-       $(shell find $(INCLUDE_DIR) -name '*.h' -a ! -name "symbols.h" -a ! -name "xkms*" -print )
+       $(shell find $(SOURCE_DIR) -name '*.c' -print )  \
+       $(shell find $(INCLUDE_DIR) -name '*.h' -a ! -name "symbols.h" -print )
 
 EXAMPLES_SOURCE_DIR=../../examples
 EXAMPLES_SOURCE_FILES=\
diff --git a/examples/Makefile b/examples/Makefile
index 4385033..89b1d61 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -6,8 +6,7 @@ PROGRAMS = \
        verify1 verify2 verify3 verify4 \
        encrypt1 encrypt2 encrypt3 \
        decrypt1 decrypt2 decrypt3 \
-       xmldsigverify \
-       xkms-server
+       xmldsigverify
 
 CC     = gcc
 CFLAGS += -g $(shell xmlsec1-config --cflags) -DUNIX_SOCKETS
diff --git a/examples/Makefile.w32 b/examples/Makefile.w32
index ee81ab3..6a3c3da 100644
--- a/examples/Makefile.w32
+++ b/examples/Makefile.w32
@@ -24,7 +24,6 @@ XMLSEC_EXAMPLES = \
        $(XMLSEC_OBJS_DIR)\decrypt1.exe \
        $(XMLSEC_OBJS_DIR)\decrypt2.exe \
        $(XMLSEC_OBJS_DIR)\decrypt3.exe \
-       $(XMLSEC_OBJS_DIR)\xkms-server.exe \
 
 # 
 !IF "$(XMLSEC_CRYPTO)" == "openssl"
diff --git a/include/xmlsec/Makefile.am b/include/xmlsec/Makefile.am
index 08592e1..b82495d 100644
--- a/include/xmlsec/Makefile.am
+++ b/include/xmlsec/Makefile.am
@@ -30,7 +30,6 @@ xmlsecinc_HEADERS = \
        transforms.h \
        version.h \
        x509.h \
-       xkms.h \
        xmldsig.h \
        xmlenc.h \
        xmlsec.h \
diff --git a/include/xmlsec/private/Makefile.am b/include/xmlsec/private/Makefile.am
index 74de46a..102e564 100644
--- a/include/xmlsec/private/Makefile.am
+++ b/include/xmlsec/private/Makefile.am
@@ -4,7 +4,6 @@ xmlsecprivateincdir = $(includedir)/xmlsec1/xmlsec/private
 
 xmlsecprivateinc_HEADERS = \
 xslt.h \
-xkms.h \
 $(NULL)
 
 install-exec-hook:
diff --git a/include/xmlsec/strings.h b/include/xmlsec/strings.h
index 9ee26d8..bf10168 100644
--- a/include/xmlsec/strings.h
+++ b/include/xmlsec/strings.h
@@ -27,7 +27,6 @@ extern "C" {
 XMLSEC_EXPORT_VAR const xmlChar xmlSecNs[];
 XMLSEC_EXPORT_VAR const xmlChar xmlSecDSigNs[];
 XMLSEC_EXPORT_VAR const xmlChar xmlSecEncNs[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsNs[];
 XMLSEC_EXPORT_VAR const xmlChar xmlSecXPathNs[];
 XMLSEC_EXPORT_VAR const xmlChar xmlSecXPath2Ns[];
 XMLSEC_EXPORT_VAR const xmlChar xmlSecXPointerNs[];
@@ -73,127 +72,6 @@ XMLSEC_EXPORT_VAR const xmlChar xmlSecTypeEncElement[];
 
 /*************************************************************************
  *
- * XKMS nodes, attributes  and value strings
- *
- ************************************************************************/
-#ifndef XMLSEC_NO_XKMS
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsServerRequestResultName[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsServerRequestStatusName[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsServerRequestLocateName[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsServerRequestValidateName[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsServerRequestCompoundName[];
-
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeResult[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeStatusRequest[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeStatusResult[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeLocateRequest[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeLocateResult[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeValidateRequest[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeValidateResult[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeCompoundRequest[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeCompoundResult[];
-
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeMessageExtension[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeOpaqueClientData[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeResponseMechanism[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeRespondWith[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodePendingNotification[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeQueryKeyBinding[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeKeyUsage[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeUseKeyWith[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeTimeInstant[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeRequestSignatureValue[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeUnverifiedKeyBinding[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeValidityInterval[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeStatus[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeValidReason[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeInvalidReason[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeIndeterminateReason[];
-
-
-XMLSEC_EXPORT_VAR const xmlChar xmlSecAttrService[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecAttrNonce[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecAttrOriginalRequestId[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecAttrResponseLimit[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecAttrMechanism[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecAttrIdentifier[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecAttrApplication[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecAttrResultMajor[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecAttrResultMinor[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecAttrRequestId[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecAttrNotBefore[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecAttrNotOnOrAfter[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecAttrTime[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecAttrStatusValue[];
-
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResponseMechanismPending[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResponseMechanismRepresent[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResponseMechanismRequestSignatureValue[];
-
-XMLSEC_EXPORT_VAR const xmlChar xmlSecRespondWithKeyName[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecRespondWithKeyValue[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecRespondWithX509Cert[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecRespondWithX509Chain[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecRespondWithX509CRL[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecRespondWithOCSP[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecRespondWithRetrievalMethod[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecRespondWithPGP[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecRespondWithPGPWeb[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecRespondWithSPKI[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecRespondWithPrivateKey[];
-
-XMLSEC_EXPORT_VAR const xmlChar xmlSecStatusResultSuccess[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecStatusResultFailed[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecStatusResultPending[];
-
-XMLSEC_EXPORT_VAR const xmlChar xmlSecKeyUsageEncryption[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecKeyUsageSignature[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecKeyUsageExchange[];
-
-XMLSEC_EXPORT_VAR const xmlChar xmlSecKeyBindingStatusValid[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecKeyBindingStatusInvalid[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecKeyBindingStatusIndeterminate[];
-
-XMLSEC_EXPORT_VAR const xmlChar xmlSecKeyBindingReasonIssuerTrust[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecKeyBindingReasonRevocationStatus[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecKeyBindingReasonValidityInterval[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecKeyBindingReasonSignature[];
-
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResultMajorCodeSuccess[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResultMajorCodeVersionMismatch[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResultMajorCodeSender[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResultMajorCodeReceiver[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResultMajorCodeRepresent[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResultMajorCodePending[];
-
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResultMinorCodeNoMatch[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResultMinorCodeTooManyResponses[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResultMinorCodeIncomplete[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResultMinorCodeFailure[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResultMinorCodeRefused[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResultMinorCodeNoAuthentication[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResultMinorCodeMessageNotSupported[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResultMinorCodeUnknownResponseId[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecResultMinorCodeNotSynchronous[];
-
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsSoapFaultReasonLang[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsSoapFaultReasonUnsupportedVersion[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsSoapFaultReasonUnableToProcess[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsSoapFaultReasonServiceUnavailable[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsSoapFaultReasonMessageNotSupported[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsSoapFaultReasonMessageInvalid[];
-
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsSoapSubcodeValueMessageNotSupported[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsSoapSubcodeValueBadMessage[];
-
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsFormatStrPlain[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsFormatStrSoap11[];
-XMLSEC_EXPORT_VAR const xmlChar xmlSecXkmsFormatStrSoap12[];
-
-#endif /* XMLSEC_NO_XKMS */
-
-/*************************************************************************
- *
  * KeyInfo and Transform Nodes
  *
  ************************************************************************/
diff --git a/include/xmlsec/xmlsec.h b/include/xmlsec/xmlsec.h
index ad44918..0e8c2c9 100644
--- a/include/xmlsec/xmlsec.h
+++ b/include/xmlsec/xmlsec.h
@@ -83,10 +83,6 @@ typedef struct _xmlSecDSigCtx                   xmlSecDSigCtx, *xmlSecDSigCtxPtr
 typedef struct _xmlSecEncCtx                    xmlSecEncCtx, *xmlSecEncCtxPtr;
 #endif /* XMLSEC_NO_XMLENC */
 
-#ifndef XMLSEC_NO_XKMS
-typedef struct _xmlSecXkmsServerCtx             xmlSecXkmsServerCtx, *xmlSecXkmsServerCtxPtr;
-#endif /* XMLSEC_NO_XKMS */
-
 XMLSEC_EXPORT int       xmlSecInit              (void);
 XMLSEC_EXPORT int       xmlSecShutdown          (void);
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 3883ab6..1b3ba92 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,7 +49,6 @@ libxmlsec1_la_SOURCES = \
        templates.c \
        transforms.c \
        x509.c \
-       xkms.c \
        xmldsig.c \
        xmlenc.c \
        xmlsec.c \
diff --git a/src/strings.c b/src/strings.c
index 818fd28..c2dd57e 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -22,7 +22,6 @@
 const xmlChar xmlSecNs[]                        = "http://www.aleksey.com/xmlsec/2002";;
 const xmlChar xmlSecDSigNs[]                    = "http://www.w3.org/2000/09/xmldsig#";;
 const xmlChar xmlSecEncNs[]                     = "http://www.w3.org/2001/04/xmlenc#";;
-const xmlChar xmlSecXkmsNs[]                    = "http://www.w3.org/2002/03/xkms#";;
 const xmlChar xmlSecXPathNs[]                   = "http://www.w3.org/TR/1999/REC-xpath-19991116";;
 const xmlChar xmlSecXPath2Ns[]                  = "http://www.w3.org/2002/06/xmldsig-filter2";;
 const xmlChar xmlSecXPointerNs[]                = "http://www.w3.org/2001/04/xmldsig-more/xptr";;
@@ -68,126 +67,6 @@ const xmlChar xmlSecTypeEncElement[]            = "http://www.w3.org/2001/04/xml
 
 /*************************************************************************
  *
- * XKMS Nodes
- *
- ************************************************************************/
-#ifndef XMLSEC_NO_XKMS
-const xmlChar xmlSecXkmsServerRequestResultName[]       = "result-response";
-const xmlChar xmlSecXkmsServerRequestStatusName[]       = "status-request";
-const xmlChar xmlSecXkmsServerRequestLocateName[]       = "locate-request";
-const xmlChar xmlSecXkmsServerRequestValidateName[]     = "validate-request";
-const xmlChar xmlSecXkmsServerRequestCompoundName[]     = "compound-request";
-
-const xmlChar xmlSecNodeResult[]                = "Result";
-const xmlChar xmlSecNodeStatusRequest[]         = "StatusRequest";
-const xmlChar xmlSecNodeStatusResult[]          = "StatusResult";
-const xmlChar xmlSecNodeLocateRequest[]         = "LocateRequest";
-const xmlChar xmlSecNodeLocateResult[]          = "LocateResult";
-const xmlChar xmlSecNodeValidateRequest[]       = "ValidateRequest";
-const xmlChar xmlSecNodeValidateResult[]        = "ValidateResult";
-const xmlChar xmlSecNodeCompoundRequest[]       = "CompoundRequest";
-const xmlChar xmlSecNodeCompoundResult[]        = "CompoundResult";
-
-const xmlChar xmlSecNodeMessageExtension[]      = "MessageExtension";
-const xmlChar xmlSecNodeOpaqueClientData[]      = "OpaqueClientData";
-const xmlChar xmlSecNodeResponseMechanism[]     = "ResponseMechanism";
-const xmlChar xmlSecNodeRespondWith[]           = "RespondWith";
-const xmlChar xmlSecNodePendingNotification[]   = "PendingNotification";
-const xmlChar xmlSecNodeQueryKeyBinding[]       = "QueryKeyBinding";
-const xmlChar xmlSecNodeKeyUsage[]              = "KeyUsage";
-const xmlChar xmlSecNodeUseKeyWith[]            = "UseKeyWith";
-const xmlChar xmlSecNodeTimeInstant[]           = "TimeInstant";
-const xmlChar xmlSecNodeRequestSignatureValue[] = "RequestSignatureValue";
-const xmlChar xmlSecNodeUnverifiedKeyBinding[]  = "UnverifiedKeyBinding";
-const xmlChar xmlSecNodeValidityInterval[]      = "ValidityInterval";
-const xmlChar xmlSecNodeStatus[]                = "Status";
-const xmlChar xmlSecNodeValidReason[]           = "ValidReason";
-const xmlChar xmlSecNodeInvalidReason[]         = "InvalidReason";
-const xmlChar xmlSecNodeIndeterminateReason[]   = "IndeterminateReason";
-
-const xmlChar xmlSecAttrService[]               = "Service";
-const xmlChar xmlSecAttrNonce[]                 = "Nonce";
-const xmlChar xmlSecAttrOriginalRequestId[]     = "OriginalRequestId";
-const xmlChar xmlSecAttrResponseLimit[]         = "ResponseLimit";
-const xmlChar xmlSecAttrMechanism[]             = "Mechanism[";
-const xmlChar xmlSecAttrIdentifier[]            = "Identifier";
-const xmlChar xmlSecAttrApplication[]           = "Application";
-const xmlChar xmlSecAttrResultMajor[]           = "ResultMajor";
-const xmlChar xmlSecAttrResultMinor[]           = "ResultMinor";
-const xmlChar xmlSecAttrRequestId[]             = "RequestId";
-const xmlChar xmlSecAttrNotBefore[]             = "NotBefore";
-const xmlChar xmlSecAttrNotOnOrAfter[]          = "NotOnOrAfter";
-const xmlChar xmlSecAttrTime[]                  = "Time";
-const xmlChar xmlSecAttrStatusValue[]           = "StatusValue";
-
-const xmlChar xmlSecResponseMechanismPending[]  = "Pending";
-const xmlChar xmlSecResponseMechanismRepresent[]= "Represent";
-const xmlChar xmlSecResponseMechanismRequestSignatureValue[] = "RequestSignatureValue";
-
-const xmlChar xmlSecRespondWithKeyName[]        = "KeyName";
-const xmlChar xmlSecRespondWithKeyValue[]       = "KeyValue";
-const xmlChar xmlSecRespondWithX509Cert[]       = "X509Cert";
-const xmlChar xmlSecRespondWithX509Chain[]      = "X509Chain";
-const xmlChar xmlSecRespondWithX509CRL[]        = "X509CRL";
-const xmlChar xmlSecRespondWithOCSP[]           = "OCSP";
-const xmlChar xmlSecRespondWithRetrievalMethod[]= "RetrievalMethod";
-const xmlChar xmlSecRespondWithPGP[]            = "PGP";
-const xmlChar xmlSecRespondWithPGPWeb[]         = "PGPWeb";
-const xmlChar xmlSecRespondWithSPKI[]           = "SPKI";
-const xmlChar xmlSecRespondWithPrivateKey[]     = "PrivateKey";
-
-const xmlChar xmlSecStatusResultSuccess[]       = "Success";
-const xmlChar xmlSecStatusResultFailed[]        = "Failed";
-const xmlChar xmlSecStatusResultPending[]       = "Pending";
-
-const xmlChar xmlSecKeyUsageEncryption[]        = "Encryption";
-const xmlChar xmlSecKeyUsageSignature[]         = "Signature";
-const xmlChar xmlSecKeyUsageExchange[]          = "Exchange";
-
-const xmlChar xmlSecKeyBindingStatusValid[]             = "Valid";
-const xmlChar xmlSecKeyBindingStatusInvalid[]           = "Invalid";
-const xmlChar xmlSecKeyBindingStatusIndeterminate[]     = "Indeterminate";
-
-const xmlChar xmlSecKeyBindingReasonIssuerTrust[]       = "IssuerTrust";
-const xmlChar xmlSecKeyBindingReasonRevocationStatus[]  = "RevocationStatus";
-const xmlChar xmlSecKeyBindingReasonValidityInterval[]  = "ValidityInterval";
-const xmlChar xmlSecKeyBindingReasonSignature[]         = "Signature";
-
-const xmlChar xmlSecResultMajorCodeSuccess[]            = "Success";
-const xmlChar xmlSecResultMajorCodeVersionMismatch[]    = "VersionMismatch";
-const xmlChar xmlSecResultMajorCodeSender[]             = "Sender";
-const xmlChar xmlSecResultMajorCodeReceiver[]           = "Receiver";
-const xmlChar xmlSecResultMajorCodeRepresent[]          = "Represent";
-const xmlChar xmlSecResultMajorCodePending[]            = "Pending";
-
-const xmlChar xmlSecResultMinorCodeNoMatch[]            = "NoMatch";
-const xmlChar xmlSecResultMinorCodeTooManyResponses[]   = "TooManyResponses";
-const xmlChar xmlSecResultMinorCodeIncomplete[]         = "Incomplete";
-const xmlChar xmlSecResultMinorCodeFailure[]            = "Failure";
-const xmlChar xmlSecResultMinorCodeRefused[]            = "Refused";
-const xmlChar xmlSecResultMinorCodeNoAuthentication[]   = "NoAuthentication";
-const xmlChar xmlSecResultMinorCodeMessageNotSupported[]= "MessageNotSupported";
-const xmlChar xmlSecResultMinorCodeUnknownResponseId[]  = "UnknownResponseId";
-const xmlChar xmlSecResultMinorCodeNotSynchronous[]     = "NotSynchronous";
-
-const xmlChar xmlSecXkmsSoapSubcodeValueMessageNotSupported[] = "MessageNotSupported";
-const xmlChar xmlSecXkmsSoapSubcodeValueBadMessage[]    = "BadMessage";
-
-const xmlChar xmlSecXkmsSoapFaultReasonLang[]               = "en";
-const xmlChar xmlSecXkmsSoapFaultReasonUnsupportedVersion[] = "Unsupported SOAP version";
-const xmlChar xmlSecXkmsSoapFaultReasonUnableToProcess[]    = "Unable to process %s";
-const xmlChar xmlSecXkmsSoapFaultReasonServiceUnavailable[] = "Service temporarily unable";
-const xmlChar xmlSecXkmsSoapFaultReasonMessageNotSupported[]= "%s message not supported";
-const xmlChar xmlSecXkmsSoapFaultReasonMessageInvalid[]     = "%s message invalid";
-
-const xmlChar xmlSecXkmsFormatStrPlain[]                = "plain";
-const xmlChar xmlSecXkmsFormatStrSoap11[]               = "soap-1.1";
-const xmlChar xmlSecXkmsFormatStrSoap12[]               = "soap-1.2";
-
-#endif /* XMLSEC_NO_XKMS */
-
-/*************************************************************************
- *
  * KeyInfo Nodes
  *
  ************************************************************************/
diff --git a/src/xmlsec.c b/src/xmlsec.c
index 8b6d0ca..4167904 100644
--- a/src/xmlsec.c
+++ b/src/xmlsec.c
@@ -21,7 +21,6 @@
 #include <xmlsec/transforms.h>
 #include <xmlsec/app.h>
 #include <xmlsec/io.h>
-#include <xmlsec/xkms.h>
 #include <xmlsec/errors.h>
 
 /**
@@ -66,24 +65,7 @@ xmlSecInit(void) {
         return(-1);
     }
 
-#ifndef XMLSEC_NO_XKMS
-    if(xmlSecXkmsRespondWithIdsInit() < 0) {
-        xmlSecError(XMLSEC_ERRORS_HERE,
-                    NULL,
-                    "xmlSecXkmsRespondWithIdsInit",
-                    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-                    XMLSEC_ERRORS_NO_MESSAGE);
-        return(-1);
-    }
-    if(xmlSecXkmsServerRequestIdsInit() < 0) {
-        xmlSecError(XMLSEC_ERRORS_HERE,
-                    NULL,
-                    "xmlSecXkmsServerRequestIdsInit",
-                    XMLSEC_ERRORS_R_XMLSEC_FAILED,
-                    XMLSEC_ERRORS_NO_MESSAGE);
-        return(-1);
-    }
-#endif /* XMLSEC_NO_XKMS */
+
 
     /* we use rand() function to generate id attributes */
     srand(time(NULL));
@@ -101,11 +83,6 @@ int
 xmlSecShutdown(void) {
     int res = 0;
 
-#ifndef XMLSEC_NO_XKMS
-    xmlSecXkmsServerRequestIdsShutdown();
-    xmlSecXkmsRespondWithIdsShutdown();
-#endif /* XMLSEC_NO_XKMS */
-
     xmlSecTransformIdsShutdown();
     xmlSecKeyDataIdsShutdown();
 
diff --git a/tests/testrun.sh b/tests/testrun.sh
index c1f629b..db1aeef 100755
--- a/tests/testrun.sh
+++ b/tests/testrun.sh
@@ -364,74 +364,6 @@ execEncTest() {
     rm -f $tmpfile $tmpfile.2
 }
 
-execXkmsServerRequestTest() {
-    expected_res="$1"
-    folder="$2"
-    filename="$3"
-    req_transforms="$4"
-    response="$5"
-    params1="$6"
-
-    # prepare
-    rm -f $tmpfile $tmpfile.2 tmpfile.3
-    old_pwd=`pwd`
-
-    # check params
-    if [ "z$expected_res" != "z$res_success" -a "z$expected_res" != "z$res_fail" ] ; then
-        echo " Bad parameter: expected_res=$expected_res"
-        cd $old_pwd
-        return
-    fi
-    if [ -n "$folder" ] ; then
-        cd $topfolder/$folder
-        full_file=$filename
-        full_resfile=$filename-$response
-        echo "$folder/$filename ($response)"
-        echo "Test: $folder/$filename in folder " `pwd` " $response ($expected_res)" >> $logfile
-    else
-        full_file=$topfolder/$filename
-        full_resfile=$topfolder/$filename-$response
-        echo "$filename ($response)"
-        echo "Test: $folder/$filename $response ($expected_res)" >> $logfile
-    fi
-
-    # check transforms
-    if [ -n "$req_transforms" ] ; then
-        printf "    Checking required transforms                         "
-        echo "$xmlsec_app check-transforms $xmlsec_params $req_transforms" >> $logfile
-        $xmlsec_app check-transforms $xmlsec_params $req_transforms >> $logfile 2>> $logfile
-        res=$?
-        if [ $res = 0 ]; then
-            echo "   OK"
-        else
-            echo " Skip"
-            return
-        fi
-    fi
-
-    # run tests
-    if [ -n "$params1" ] ; then
-        printf "    Processing xkms request                              "
-        echo "$xmlsec_app --xkms-server-request --output $tmpfile $xmlsec_params $params1 $full_file.xml" >> 
$logfile
-        $VALGRIND $xmlsec_app --xkms-server-request  --output $tmpfile $xmlsec_params $params1 
$full_file.xml >> $logfile 2>> $logfile
-        res=$?
-        if [ $res = 0 ]; then
-            # cleanup Id attribute because it is generated every time
-            sed 's/ Id="[^\"]*"/ Id=""/g' $full_resfile > $tmpfile.2
-            sed 's/ Id="[^\"]*"/ Id=""/g' $tmpfile > $tmpfile.3
-            diff $tmpfile.2 $tmpfile.3 >> $logfile 2>> $logfile
-            printRes $expected_res $?
-        else
-            printRes $expected_res $res
-        fi
-    fi
-
-    # cleanup
-    cd $old_pwd
-    rm -f $tmpfile $tmpfile.2 tmpfile.3
-}
-
-
 # prepare
 rm -rf $tmpfile $tmpfile.2 tmpfile.3
 
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
index 2712a0a..b4f4691 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
@@ -153,7 +153,6 @@ XMLSEC_OBJS = \
        $(XMLSEC_INTDIR)\templates.obj \
        $(XMLSEC_INTDIR)\transforms.obj \
        $(XMLSEC_INTDIR)\x509.obj \
-       $(XMLSEC_INTDIR)\xkms.obj \
        $(XMLSEC_INTDIR)\xmldsig.obj \
        $(XMLSEC_INTDIR)\xmlenc.obj \
        $(XMLSEC_INTDIR)\xmlsec.obj \
@@ -184,7 +183,6 @@ XMLSEC_OBJS_A = \
        $(XMLSEC_INTDIR_A)\templates.obj \
        $(XMLSEC_INTDIR_A)\transforms.obj \
        $(XMLSEC_INTDIR_A)\x509.obj \
-       $(XMLSEC_INTDIR_A)\xkms.obj \
        $(XMLSEC_INTDIR_A)\xmldsig.obj \
        $(XMLSEC_INTDIR_A)\xmlenc.obj \
        $(XMLSEC_INTDIR_A)\xmlsec.obj \
@@ -480,13 +478,6 @@ check-enc : $(BINDIR)\$(APP_NAME)
        sh ./tests/testrun.sh ./tests/testEnc.sh default ./tests win32/$(BINDIR)/$(APP_NAME) der
        cd win32
 
-check-xkms : $(BINDIR)\$(APP_NAME)
-       cd ..
-       if not exist win32\tmp mkdir win32\tmp
-       set TMPFOLDER=win32\tmp
-       sh ./tests/testrun.sh ./tests/testXKMS.sh default ./tests win32/$(BINDIR)/$(APP_NAME) der
-       cd win32
-               
 clean :
        if exist $(XMLSEC_INTDIR) rmdir /S /Q $(XMLSEC_INTDIR)
        if exist $(XMLSEC_INTDIR_A) rmdir /S /Q $(XMLSEC_INTDIR_A)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]