From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 21 Jul 2020 18:53:00 +0000 (-0700)
Subject: Resubmit - Move vgauth to gcc6 and openssl-1.1.1e.
X-Git-Tag: stable-11.2.0~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1fdd4f15337cfb314652b66bbcc7be4bca100c3;p=thirdparty%2Fopen-vm-tools.git

Resubmit - Move vgauth to gcc6 and openssl-1.1.1e.
---

diff --git a/open-vm-tools/vgauth/common/certverify.h b/open-vm-tools/vgauth/common/certverify.h
index 3fe1bcb4e..d7c6410b6 100644
--- a/open-vm-tools/vgauth/common/certverify.h
+++ b/open-vm-tools/vgauth/common/certverify.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2011-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 2011-2016, 2020 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
@@ -27,6 +27,7 @@
 
 #include <glib.h>
 #include "VGAuthAuthentication.h"
+#include "openssl/opensslv.h"  // For OPENSSL_VERSION_NUMBER.
 
 /* new API from OpenSSL 1.1.0
  *      https://www.openssl.org/docs/manmaster/crypto/EVP_DigestInit.html
diff --git a/open-vm-tools/vgauth/lib/proto.c b/open-vm-tools/vgauth/lib/proto.c
index d4d3c4d36..123869189 100644
--- a/open-vm-tools/vgauth/lib/proto.c
+++ b/open-vm-tools/vgauth/lib/proto.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2012-2017,2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 2012-2017, 2019-2020 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
@@ -2068,7 +2068,7 @@ VGAuth_SendValidateSamlBearerTokenRequest(VGAuthContext *ctx,
    *userHandle = NULL;
 
    /*
-    * ValidateSAMLBeraerToken has no security restrictions, so we don't care
+    * ValidateSAMLBearerToken has no security restrictions, so we don't care
     * what user is used.
     */
    if (!VGAuth_IsConnectedToServiceAsAnyUser(ctx)) {
diff --git a/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c b/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c
index d5bb4f8b9..fbadee2c6 100644
--- a/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c
+++ b/open-vm-tools/vgauth/serviceImpl/saml-xmlsec1.c
@@ -1120,7 +1120,7 @@ BuildCertChain(xmlNodePtr x509Node,
        */
       ret = xmlSecCryptoAppKeysMngrCertLoadMemory(mgr,
                                                   pemCert,
-                                                  strlen(pemCert),
+                                                  (xmlSecSize) strlen(pemCert),
                                                   xmlSecKeyDataFormatPem,
                                                   xmlSecKeyDataTypeTrusted);
       if (ret < 0) {