Merge branch 'task/sec2_aes_iv_usage' into 'master'

Updated provisioning security2 scheme.

See merge request idf/esp-idf-provisioning-android!72

Author: adwait-esp

README.md

@@ -48,7 +48,7 @@ To get this app please clone this repository using the below command:
  ```
 And add a dependency code to your  app module's  `build.gradle`  file. 
 ```  
- implementation 'com.github.espressif:esp-idf-provisioning-android:lib-2.2.2'
+ implementation 'com.github.espressif:esp-idf-provisioning-android:lib-2.2.3'
 ```
 
 ## Using Provisioning Library

app/build.gradle

@@ -17,8 +17,8 @@ android {
         applicationId "com.espressif.wifi_provisioning"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 23
-        versionName "2.2.2 - ${getGitHash()}"
+        versionCode 24
+        versionName "2.2.3 - ${getGitHash()}"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-proguard-rules.pro"
     }

provisioning/src/main/java/com/espressif/provisioning/ESPDevice.java

@@ -79,6 +79,7 @@ public class ESPDevice {
     private Session session;
     private Security security;
     private Transport transport;
+    private int secPatchVersion;
 
     private WiFiScanListener wifiScanListener;
     private ProvisionListener provisionListener;
@@ -338,6 +339,15 @@ public void setProofOfPossession(String pop) {
         this.proofOfPossession = pop;
     }
 
+    /**
+     * This method used to set security patch version, received from device.
+     *
+     * @param patchVersion Security patch version to be set.
+     */
+    public void setSecPatchVersion(int patchVersion) {
+        this.secPatchVersion = patchVersion;
+    }
+
     /**
      * This method is used to get Proof Of Possession.
      *
@@ -662,6 +672,7 @@ public void initSession(final ResponseListener listener) {
             Log.d(TAG, "Device Version : " + deviceVersion);
             Log.d(TAG, "sec_ver value : " + provInfo.optInt("sec_ver"));
             Log.d(TAG, "Has sec_ver key : " + provInfo.has("sec_ver"));
+            Log.d(TAG, "Has sec_patch_ver key : " + provInfo.has("sec_patch_ver"));
 
             if (provInfo.has("sec_ver")) {
 
@@ -678,6 +689,10 @@ public void initSession(final ResponseListener listener) {
                     case 2:
                     default:
                         securityType = ESPConstants.SecurityType.SECURITY_2;
+                        if (provInfo.has("sec_patch_ver")) {
+                            secPatchVersion = provInfo.optInt("sec_patch_ver");
+                            Log.d(TAG, "Security Patch Version : " + secPatchVersion);
+                        }
                         break;
                 }
             } else {
@@ -702,7 +717,11 @@ public void initSession(final ResponseListener listener) {
                     security = new Security1(proofOfPossession);
                     break;
                 case SECURITY_2:
-                    security = new Security2(userName, proofOfPossession);
+                    if (secPatchVersion == 1) {
+                        security = new Security2(userName, proofOfPossession, secPatchVersion);
+                    } else {
+                        security = new Security2(userName, proofOfPossession);
+                    }
                     break;
             }
 

provisioning/src/main/java/com/espressif/provisioning/security/Security2.java

@@ -66,15 +66,28 @@ public class Security2 implements Security {
     private byte[] clientProof;
     private byte[] sharedKey;
     private byte[] key;
+    private int counter;
+    private int secPatchVersion = 0;
 
     /***
      * Create Security 1 implementation
      */
     public Security2(String username, String password) {
 
         userName = username;
-        Log.d(TAG, "User name : " + username + " password : " + password);
+        try {
+            this.cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
+            e.printStackTrace();
+        }
+        client = new SRP6ClientSession();
+        client.step1(username, password);
+    }
 
+    public Security2(String username, String password, int patchVersion) {
+
+        userName = username;
+        this.secPatchVersion = patchVersion;
         try {
             this.cipher = Cipher.getInstance("AES/GCM/NoPadding");
         } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
@@ -210,6 +223,8 @@ private void processStep1Response(byte[] hexData) throws RuntimeException {
             sharedKey = BigIntegerUtils.bigIntegerToBytes(client.K);
             key = Arrays.copyOfRange(sharedKey, 0, 32);
 
+            counter = (deviceNonce[8] & 0xFF) << 24 | (deviceNonce[9] & 0xFF) << 16 | (deviceNonce[10] & 0xFF) << 8 | (deviceNonce[11] & 0xFF);
+
         } catch (InvalidProtocolBufferException e) {
             Log.e(TAG, e.getMessage());
         }
@@ -220,6 +235,15 @@ public byte[] encrypt(byte[] data) {
         // Device nonce = IV
         SecretKeySpec secretKeySpec = new SecretKeySpec(key, "AES");
         IvParameterSpec parameterSpec = new IvParameterSpec(deviceNonce);
+
+        if (secPatchVersion == 1) {
+            byte[] nonce = new byte[12];
+            System.arraycopy(deviceNonce, 0, nonce, 0, 8);
+            System.arraycopy(intToBigEndian(counter), 0, nonce, 8, 4);
+            counter++;
+            parameterSpec = new IvParameterSpec(nonce);
+        }
+
         try {
             this.cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, parameterSpec);
         } catch (InvalidAlgorithmParameterException e) {
@@ -242,6 +266,15 @@ public byte[] decrypt(byte[] data) {
 
         SecretKeySpec secretKeySpec = new SecretKeySpec(key, "AES");
         IvParameterSpec parameterSpec = new IvParameterSpec(deviceNonce);
+
+        if (secPatchVersion == 1) {
+            byte[] nonce = new byte[12];
+            System.arraycopy(deviceNonce, 0, nonce, 0, 8);
+            System.arraycopy(intToBigEndian(counter), 0, nonce, 8, 4);
+            counter++;
+            parameterSpec = new IvParameterSpec(nonce);
+        }
+
         try {
             this.cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, parameterSpec);
         } catch (InvalidAlgorithmParameterException e) {
@@ -259,4 +292,13 @@ public byte[] decrypt(byte[] data) {
         }
         return null;
     }
+
+    private byte[] intToBigEndian(int value) {
+        return new byte[]{
+                (byte) (value >> 24),
+                (byte) (value >> 16),
+                (byte) (value >> 8),
+                (byte) value
+        };
+    }
 }