Merge branch 'AlwaysEncrypted' of https://github.com/Microsoft/msphpsql into AlwaysEncrypted

test/functional/pdo_sqlsrv/MsSetup.inc

@@ -40,4 +40,8 @@ $marsMode = true;
 $dsnMode = true;
 $traceEnabled = false;
 
+// column encryption variables
+$keystore = "none";         // key store provider, acceptable values are none, win, ksp, akv
+$dataEncrypted = false;     // whether data is to be encrypted
+
 ?>

test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Fetch data from a prepopulated test table given a custom keystore provider
 --SKIPIF--
-<?php require('skipif_versions_old.inc'); ?>
+<?php require('skipif_not_ksp.inc'); ?>
 --FILE--
 <?php
     require( 'MsSetup.inc' );

test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_encrypted.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Fetch encrypted data from a prepopulated test table given a custom keystore provider
 --SKIPIF--
-<?php require('skipif_versions_old.inc'); ?>
+<?php require('skipif_not_ksp.inc'); ?>
 --FILE--
 <?php
     require( 'MsSetup.inc' );

test/functional/pdo_sqlsrv/skipif_not_ksp.inc

@@ -0,0 +1,22 @@
+<?php
+
+if (! extension_loaded( 'pdo' ) || ! extension_loaded( 'pdo_sqlsrv' ))
+    die( "PDO driver cannot be loaded; skipping test.\n" );
+
+require_once( "MsSetup.inc" );
+
+if ($keystore != 'ksp')
+    die ( 'skip - this test requires a custom keystore provider.' );
+
+require_once( "MsCommon.inc" );
+
+$conn = new PDO( "sqlsrv:server = $server;", $uid, $pwd );
+if( ! $conn )
+{
+    echo( "Error: could not connect during SKIPIF!" );
+}
+else if(! IsAEQualified($conn))
+{
+    die( "skip - AE feature not supported in the current environment." );
+}
+?>

test/functional/sqlsrv/MsSetup.inc

@@ -40,4 +40,9 @@ if (isset($_ENV['MSSQL_SERVER']) || isset($_ENV['MSSQL_USER']) || isset($_ENV['M
     $pwd = $userPassword; 
     $databaseName = $database; 
 }
+
+// column encryption variables
+$keystore = "none";         // key store provider, acceptable values are none, win, ksp, akv
+$dataEncrypted = false;     // whether data is to be encrypted
+
 ?>

test/functional/sqlsrv/skipif_not_ksp.inc

@@ -0,0 +1,23 @@
+<?php
+
+if(! extension_loaded( "sqlsrv" ) ) 
+    die( "skip extension not loaded" );
+
+require_once( 'MsSetup.inc' );
+
+if ($keystore != 'ksp')
+    die ( 'skip - this test requires a custom keystore provider.' );
+
+require_once( 'MsCommon.inc' );
+
+$conn = Connect();
+if( ! $conn )
+{
+    echo( "Error: could not connect during SKIPIF!" );
+}
+else if(! IsAEQualified( $conn ) )
+{
+    die( "skip - AE feature not supported in the current environment." );
+}  
+
+?>

test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Fetch data from a prepopulated test table given a custom keystore provider
 --SKIPIF--
-<?php require('skipif_versions_old.inc'); ?>
+<?php require('skipif_not_ksp.inc'); ?>
 --FILE--
 <?php
     sqlsrv_configure( 'WarningsReturnAsErrors', 1 );

test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp_encrypted.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Fetch encrypted data from a prepopulated test table given a custom keystore provider
 --SKIPIF--
-<?php require('skipif_versions_old.inc'); ?>
+<?php require('skipif_not_ksp.inc'); ?>
 --FILE--
 <?php
     sqlsrv_configure( 'WarningsReturnAsErrors', 1 );

test/functional/sqlsrv/sqlsrv_encrypted_patients_ksp.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Test simple insert, fetch and update with ColumnEncryption enabled and a custome keystore provider
 --SKIPIF--
-<?php require('skipif_versions_old.inc'); ?>
+<?php require('skipif_not_ksp.inc'); ?>
 --FILE--
 <?php
     function CreatePatientsTable()