Merge pull request microsoft#54 from lilgreenbird/aev2rene

added attestationProtocol to datasource
lilgreenbird · Oct 11, 2019 · 4946b6d · 4946b6d
2 parents 3bdd870 + ae93f86
commit 4946b6d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/ISQLServerDataSource.java b/src/main/java/com/microsoft/sqlserver/jdbc/ISQLServerDataSource.java
@@ -850,7 +850,7 @@ public interface ISQLServerDataSource extends javax.sql.CommonDataSource {
      * @return 'domain' property value
      */
     String getDomain();
-    
+
     /**
      * Sets the 'domain' connection property used for NTLM Authentication.
      *
@@ -888,4 +888,20 @@ public interface ISQLServerDataSource extends javax.sql.CommonDataSource {
      *        Enclave attestation url.
      */
     void setEnclaveAttestationUrl(String url);
+
+    /**
+     * Returns the enclave attestation protocol used with enclave based Always Encrypted.
+     * 
+     * @return Enclave attestation protocol.
+     */
+    String getEnclaveAttestationProtocol();
+
+    /**
+     * Sets the enclave attestation protocol to be used with enclave based Always Encrypted.
+     * 
+     * @param protocol
+     *        Enclave attestation protocol.
+     */
+    void setEnclaveAttestationProtocol(String protocol);
+
 }
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataSource.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataSource.java
@@ -915,7 +915,7 @@ public String getDomain() {
         return getStringProperty(connectionProps, SQLServerDriverStringProperty.DOMAIN.toString(),
                 SQLServerDriverStringProperty.DOMAIN.getDefaultValue());
     }
-    
+
     @Override
     public void setDomain(String domain) {
         setStringProperty(connectionProps, SQLServerDriverStringProperty.DOMAIN.toString(), domain);
@@ -926,13 +926,24 @@ public String getEnclaveAttestationUrl() {
         return getStringProperty(connectionProps, SQLServerDriverStringProperty.ENCLAVE_ATTESTATION_URL.toString(),
                 SQLServerDriverStringProperty.ENCLAVE_ATTESTATION_URL.getDefaultValue());
     }
-    
+
     @Override
     public void setEnclaveAttestationUrl(String url) {
         setStringProperty(connectionProps, SQLServerDriverStringProperty.ENCLAVE_ATTESTATION_URL.toString(), url);
     }
 
-
+    @Override
+    public String getEnclaveAttestationProtocol() {
+        return getStringProperty(connectionProps, SQLServerDriverStringProperty.ENCLAVE_ATTESTATION_PROTOCOL.toString(),
+                SQLServerDriverStringProperty.ENCLAVE_ATTESTATION_PROTOCOL.getDefaultValue());
+    }
+
+    @Override
+    public void setEnclaveAttestationProtocol(String protocol) {
+        setStringProperty(connectionProps, SQLServerDriverStringProperty.ENCLAVE_ATTESTATION_PROTOCOL.toString(),
+                protocol);
+    }
+
     /**
      * Sets a property string value.
      *