Merge branch 'dev' into sqlsrvAE
This commit is contained in:
commit
783c096496
|
@ -174,7 +174,6 @@ class ColumnMeta
|
||||||
} else {
|
} else {
|
||||||
$this->encType = $encType;
|
$this->encType = $encType;
|
||||||
}
|
}
|
||||||
$this->encType = $encType;
|
|
||||||
$this->forceEncrypt = $forceEncrypt;
|
$this->forceEncrypt = $forceEncrypt;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -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";
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in a new issue