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 3fe1bcb4ea849fc6aafa78469673e749c50394fa..d7c6410b6e978d2bb71670ca92c44136ab20c40d 100644 (file)
--- 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 d4d3c4d3645b276904d1bdfd9263b692cfaf3efd..1238691893dcbccd6cbceb9c7371ba9c3193ecf8 100644 (file)
--- 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 d5bb4f8b9e34bc694d0e72922587cbb7c8847049..fbadee2c65a408ef49e9d83b9e25ab05a5a43b88 100644 (file)
--- 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) {