Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Formatted the check that assigns AE version to correctly assign version to protocol #1805

Merged
merged 11 commits into from
Apr 19, 2022
Merged

Formatted the check that assigns AE version to correctly assign version to protocol #1805

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6631d6a
Potential fix for bamboo issues
Jeffery-Wasty Apr 8, 2022
9c29f29
Changed SQLServerConnection to fix all protocols being assigned to AEV1
Jeffery-Wasty Apr 14, 2022
4d304bc
Changed SQLServerConnection::5682 back to working state
Jeffery-Wasty Apr 14, 2022
6d00537
Added a missing pair of parantheses
Jeffery-Wasty Apr 14, 2022
a0aa529
Added version change (already committed to main) to prevent pipeline …
Jeffery-Wasty Apr 14, 2022
4582589
Merge branch 'main' into attestation-testing
Jeffery-Wasty Apr 14, 2022
638d2cb
Formatting plus an explanation comment
Jeffery-Wasty Apr 14, 2022
ce759f9
More formatting
Jeffery-Wasty Apr 14, 2022
ace040a
hopefully the final formatting change
Jeffery-Wasty Apr 14, 2022
d83e4ac
Simplified the AE Version check
Jeffery-Wasty Apr 14, 2022
7a8bd18
Removed check for if protocol is empty, since it can never be that
Jeffery-Wasty Apr 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
final class SQLJdbcVersion {
static final int major = 11;
static final int minor = 1;
static final int patch = 0;
static final int patch = 1;
static final int build = 0;
/*
* Used to load mssql-jdbc_auth DLL.
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4561,8 +4561,12 @@ int writeAEFeatureRequest(boolean write, /* if false just calculates the length
if (write) {
tdsWriter.writeByte(TDS.TDS_FEATURE_EXT_AE); // FEATUREEXT_TC
tdsWriter.writeInt(1); // length of version
if (null == enclaveAttestationUrl || enclaveAttestationUrl.isEmpty() || (enclaveAttestationProtocol != null
&& !enclaveAttestationProtocol.equalsIgnoreCase(AttestationProtocol.NONE.toString()))) {

// For protocol = HGS,AAS, we want V2, unless URL is null or empty, in which case we want V1
// For protocol = NONE, we always want V2, even with a URL that is none or empty
// For protocol = null, we always want V1
if (null == enclaveAttestationProtocol || ((null == enclaveAttestationUrl || enclaveAttestationUrl.isEmpty())
&& !enclaveAttestationProtocol.equalsIgnoreCase(AttestationProtocol.NONE.toString()))) {
Jeffery-Wasty marked this conversation as resolved.
Show resolved Hide resolved
tdsWriter.writeByte(TDS.COLUMNENCRYPTION_VERSION1);
} else {
tdsWriter.writeByte(TDS.COLUMNENCRYPTION_VERSION2);
Expand Down