dprevot/php-sqlsrv
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix setting encryption type in MsCommon_mid-refactor.inc

Browse source
This commit is contained in:
v-kaywon 2017-12-12 14:36:02 -08:00
parent a8c43e8d20
commit feebf20d4e
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/functional/pdo_sqlsrv/MsCommon_mid-refactor.inc
View file

@ -174,7 +174,6 @@ class ColumnMeta
} else { } else {
$this->encType = $encType; $this->encType = $encType;
} }
$this->encType = $encType;
$this->forceEncrypt = $forceEncrypt; $this->forceEncrypt = $forceEncrypt;
} }
/** /**

16
test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_errors.phpt
View file

@ -7,7 +7,7 @@ Connect using a custom keystore provider with some required inputs missing
require("MsSetup.inc"); require("MsSetup.inc");
require_once("MsCommon_mid-refactor.inc"); require_once("MsCommon_mid-refactor.inc");
function connect( $connectionInfo ) function kspConnect( $connectionInfo )
{ {
global $server, $uid, $pwd; global $server, $uid, $pwd;
@ -30,46 +30,46 @@ Connect using a custom keystore provider with some required inputs missing
echo("Connecting... with column encryption\n"); echo("Connecting... with column encryption\n");
$connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; "; $connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; ";
connect( $connectionInfo ); kspConnect( $connectionInfo );
echo("\nConnecting... with an invalid input to CEKeystoreProvider\n"); echo("\nConnecting... with an invalid input to CEKeystoreProvider\n");
$connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; "; $connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; ";
$connectionInfo .= "CEKeystoreName = 1; "; $connectionInfo .= "CEKeystoreName = 1; ";
$connectionInfo .= "CEKeystoreProvider = $ksp_path; "; $connectionInfo .= "CEKeystoreProvider = $ksp_path; ";
$connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key; "; $connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key; ";
connect( $connectionInfo ); kspConnect( $connectionInfo );
echo("\nConnecting... with an empty path\n"); echo("\nConnecting... with an empty path\n");
$connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; "; $connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; ";
$connectionInfo .= "CEKeystoreName = $ksp_name; "; $connectionInfo .= "CEKeystoreName = $ksp_name; ";
$connectionInfo .= "CEKeystoreProvider = ; "; $connectionInfo .= "CEKeystoreProvider = ; ";
$connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key; "; $connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key; ";
connect( $connectionInfo ); kspConnect( $connectionInfo );
echo("\nConnecting... without a path\n"); echo("\nConnecting... without a path\n");
$connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; "; $connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; ";
$connectionInfo .= "CEKeystoreName = $ksp_name; "; $connectionInfo .= "CEKeystoreName = $ksp_name; ";
$connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key;"; $connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key;";
connect( $connectionInfo ); kspConnect( $connectionInfo );
echo("\nConnecting... without a name\n"); echo("\nConnecting... without a name\n");
$connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; "; $connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; ";
$connectionInfo .= "CEKeystoreProvider = $ksp_path; "; $connectionInfo .= "CEKeystoreProvider = $ksp_path; ";
$connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key; "; $connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key; ";
connect( $connectionInfo ); kspConnect( $connectionInfo );
echo("\nConnecting... without a key\n"); echo("\nConnecting... without a key\n");
$connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; "; $connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; ";
$connectionInfo .= "CEKeystoreProvider = $ksp_path; "; $connectionInfo .= "CEKeystoreProvider = $ksp_path; ";
$connectionInfo .= "CEKeystoreName = $ksp_name; "; $connectionInfo .= "CEKeystoreName = $ksp_name; ";
connect( $connectionInfo ); kspConnect( $connectionInfo );
echo("\nConnecting... with all required inputs\n"); echo("\nConnecting... with all required inputs\n");
$connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; "; $connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; ";
$connectionInfo .= "CEKeystoreProvider = $ksp_path; "; $connectionInfo .= "CEKeystoreProvider = $ksp_path; ";
$connectionInfo .= "CEKeystoreName = $ksp_name; "; $connectionInfo .= "CEKeystoreName = $ksp_name; ";
$connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key; "; $connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key; ";
connect( $connectionInfo ); kspConnect( $connectionInfo );
echo "Done\n"; echo "Done\n";
?> ?>