Fix ver_set_condition call

Author: Julia-Garland

src/libmongoc/CMakeLists.txt

@@ -562,10 +562,8 @@ if (WIN32 AND MONGOC_ENABLE_SSL_SECURE_CHANNEL)
 endif()
 
 if (HAVE_SCH_CREDENTIALS)
-   message(STATUS "SCH_CREDENTIALS symbol found.")    
    set (MONGOC_HAVE_SCH_CREDENTIALS 1)
 else ()
-   message(STATUS "SCH_CREDENTIALS symbol not found. Using SCHANNEL_CRED.")
    set (MONGOC_HAVE_SCH_CREDENTIALS 0)
 endif ()
 

src/libmongoc/src/mongoc/mongoc-stream-tls-secure-channel-private.h

@@ -54,7 +54,7 @@ typedef struct {
 
 // `mongoc_secure_channel_cred` may be shared on multiple connections.
 typedef struct _mongoc_secure_channel_cred {
-   PCCERT_CONTEXT cert;                                                   /* Owning. Optional client cert. */
+   PCCERT_CONTEXT cert; /* Owning. Optional client cert. */
 #ifdef MONGOC_HAVE_SCH_CREDENTIALS
    SCH_CREDENTIALS *cred;
 #else

src/libmongoc/src/mongoc/mongoc-stream-tls-secure-channel.c

@@ -918,6 +918,7 @@ mongoc_secure_channel_cred_new(const mongoc_ssl_opt_t *opt)
    if ((is_server && _mongoc_verify_windows_version(10, 0, 19044, false)) ||
        (!is_server && _mongoc_verify_windows_version(10, 0, 22000, false))) {
       enabled_protocols |= SP_PROT_TLS1_3_CLIENT;
+      printf("Enabling TLS 1.3 with Secure Channel \n");
    }
    cred->cred->pTlsParameters->grbitDisabledProtocols = (DWORD)~enabled_protocols;
 #else

src/libmongoc/src/mongoc/mongoc-version-functions.c

@@ -107,8 +107,8 @@ _mongoc_verify_windows_version(int major_version, int minor_version, int build_n
    osvi.dwMinorVersion = minor_version;
 
    ULONGLONG mask = 0;
-   mask = VER_SET_CONDITION(mask, VER_MAJORVERSION, op);
-   mask = VER_SET_CONDITION(mask, VER_MINORVERSION, op);
+   VER_SET_CONDITION(mask, VER_MAJORVERSION, op);
+   VER_SET_CONDITION(mask, VER_MINORVERSION, op);
 
    matched = VerifyVersionInfo(&osvi, VER_MAJORVERSION | VER_MINORVERSION, mask);
 
@@ -119,7 +119,7 @@ _mongoc_verify_windows_version(int major_version, int minor_version, int build_n
       osvi.dwBuildNumber = build_number;
 
       mask = 0;
-      mask = VER_SET_CONDITION(mask, VER_BUILDNUMBER, op);
+      VER_SET_CONDITION(mask, VER_BUILDNUMBER, op);
 
       matched = VerifyVersionInfo(&osvi, VER_BUILDNUMBER, mask);
    }