From b1288208a5a55ff5a6e5b94cc51c4ee20ee18662 Mon Sep 17 00:00:00 2001
From: David Puglielli <v-dapugl@microsoft.com>
Date: Tue, 29 May 2018 14:40:45 -0700
Subject: [PATCH 1/2] Fixed akv test failures with win encryption

---
 .../pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt         | 6 ++++++
 .../sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt          | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt b/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt
index 136e8725..5f0c4068 100644
--- a/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt
@@ -6,6 +6,12 @@ Test connection keywords for Azure Key Vault for Always Encrypted.
 <?php
 require_once('pdo_ae_azure_key_vault_common.php');
 
+// This test only applies to Azure Key Vault, or to no encryption at all
+if ($keystore != 'none' and $keystore != 'akv') {
+    echo "Done.\n";
+    exit();
+}
+
 // We will test the direct product (set of all possible combinations) of the following
 $columnEncryption = ['enabled', 'disabled', 'notvalid', ''];
 $keyStoreAuthentication = ['KeyVaultPassword', 'KeyVaultClientSecret', 'KeyVaultNothing', ''];
diff --git a/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
index 301a0ffa..b4d13f16 100644
--- a/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
+++ b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
@@ -6,6 +6,12 @@ Test connection keywords for Azure Key Vault for Always Encrypted.
 <?php
 require_once('sqlsrv_ae_azure_key_vault_common.php');
 
+// This test only applies to Azure Key Vault, or to no encryption at all
+if ($keystore != 'none' and $keystore != 'akv') {
+    echo "Done.\n";
+    exit();
+}
+
 // We will test the direct product (set of all possible combinations) of the following
 $columnEncryption = ['enabled', 'disabled', 'notvalid', ''];
 $keyStoreAuthentication = ['KeyVaultPassword', 'KeyVaultClientSecret', 'KeyVaultNothing', ''];

From 9d1eafd6b3a4b80fddd58798a7783899bf1e4db0 Mon Sep 17 00:00:00 2001
From: David Puglielli <v-dapugl@microsoft.com>
Date: Tue, 29 May 2018 16:22:26 -0700
Subject: [PATCH 2/2] Fixed encryption check

---
 .../functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
index b4d13f16..f7eed244 100644
--- a/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
+++ b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
@@ -129,7 +129,7 @@ for ($i = 0; $i < sizeof($columnEncryption); ++$i) {
                     if (sqlsrv_execute($stmt) == false) {
                         $errors = sqlsrv_errors();
 
-                        if (!AE\isColEncrypted()) {
+                        if (!AE\isDataEncrypted()) {
                             checkErrors(
                                 $errors,
                                 array('CE258', '0'),
@@ -148,7 +148,7 @@ for ($i = 0; $i < sizeof($columnEncryption); ++$i) {
                     } else {
                         // The INSERT query succeeded with bad credentials, which
                         // should only happen when encryption is not enabled.
-                        if (AE\isColEncrypted()) {
+                        if (AE\isDataEncrypted()) {
                             fatalError("Successful insertion with bad credentials\n");
                         }
                     }