From: Katy Feng <fkaty@vmware.com>
Date: Tue, 22 Aug 2023 18:11:41 +0000 (-0700)
Subject: Changes to common source files not applicable to open-vm-tools.
X-Git-Tag: stable-12.3.0~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55d4f25e7ad27b77268bf5f2d61e75336890dacc;p=thirdparty%2Fopen-vm-tools.git

Changes to common source files not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/foundryMsg/foundryMsg.c b/open-vm-tools/lib/foundryMsg/foundryMsg.c
index 869458d96..96ba86241 100644
--- a/open-vm-tools/lib/foundryMsg/foundryMsg.c
+++ b/open-vm-tools/lib/foundryMsg/foundryMsg.c
@@ -637,7 +637,8 @@ VixMsg_AllocRequestMsg(size_t msgHeaderAndBodyLength,    // IN
       || (VIX_USER_CREDENTIAL_HOST_CONFIG_HASHED_SECRET == credentialType)
       || (VIX_USER_CREDENTIAL_TICKETED_SESSION == credentialType)
       || (VIX_USER_CREDENTIAL_SSPI == credentialType)
-      || (VIX_USER_CREDENTIAL_SAML_BEARER_TOKEN == credentialType)) {
+      || (VIX_USER_CREDENTIAL_SAML_BEARER_TOKEN == credentialType)
+      || (VIX_USER_CREDENTIAL_SAML_BEARER_TOKEN_HOST_VERIFIED == credentialType)) {
       /*
        * All of these are optional.
        */
@@ -690,7 +691,8 @@ VixMsg_AllocRequestMsg(size_t msgHeaderAndBodyLength,    // IN
          || (VIX_USER_CREDENTIAL_HOST_CONFIG_HASHED_SECRET == credentialType)
          || (VIX_USER_CREDENTIAL_TICKETED_SESSION == credentialType)
          || (VIX_USER_CREDENTIAL_SSPI == credentialType)
-         || (VIX_USER_CREDENTIAL_SAML_BEARER_TOKEN == credentialType)) {
+         || (VIX_USER_CREDENTIAL_SAML_BEARER_TOKEN == credentialType)
+         || (VIX_USER_CREDENTIAL_SAML_BEARER_TOKEN_HOST_VERIFIED == credentialType)) {
       char *destPtr = (char *) commandRequest;
 
       destPtr += commandRequest->commonHeader.headerLength;
diff --git a/open-vm-tools/lib/include/vixCommands.h b/open-vm-tools/lib/include/vixCommands.h
index 4ef61966d..8371f3d8f 100644
--- a/open-vm-tools/lib/include/vixCommands.h
+++ b/open-vm-tools/lib/include/vixCommands.h
@@ -76,6 +76,11 @@ extern "C" {
 
 #define VIX_SHARED_SECRET_CONFIG_USER_NAME          "__VMware_Vix_Shared_Secret_1__"
 
+/*
+ * Base64 encoded value of string %HOST_VERIFIED_SIGNATURE%
+ */
+#define VIX_BASE64_ENCODED_HOST_VERIFIED_SIGNATURE_VALUE    "JUhPU1RfVkVSSUZJRURfU0lHTkFUVVJFJQA="
+
 
 /*
  * This is the port for the server side remote Vix component
diff --git a/open-vm-tools/lib/include/vixOpenSource.h b/open-vm-tools/lib/include/vixOpenSource.h
index 517b2f78d..7eef83e6c 100644
--- a/open-vm-tools/lib/include/vixOpenSource.h
+++ b/open-vm-tools/lib/include/vixOpenSource.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2007-2021 VMware, Inc. All rights reserved.
+ * Copyright (C) 2007-2021, 2023 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -547,6 +547,11 @@ Bool Vix_XMLFindStringElementText(const char *pattern,
 Bool Vix_XMLResultIsEscaped(const char *resultXML,
                             const char *dataParentTag);
 
+Bool Vix_XMLModifyStringElementText(const char *pattern,
+                                    char *str,
+                                    const char *replaceStr,
+                                    char **resultStr);
+
 Bool Vix_IsValidString(const char *str);
 #endif   // VIX_HIDE_FROM_JAVA