update

EspressifApp · Oct 10, 2024 · e4229d1 · e4229d1
1 parent 58f2f28
commit e4229d1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url = uri("https://jitpack.io") }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.6.1'
+        classpath 'com.android.tools.build:gradle:8.7.0'
     }
 }
 

diff --git a/esptouch-v2/src/main/java/com/espressif/iot/esptouch2/provision/EspProvisioningParams.java b/esptouch-v2/src/main/java/com/espressif/iot/esptouch2/provision/EspProvisioningParams.java
@@ -256,7 +256,8 @@ private void generate() {
         os.write(ssidPadding, 0, ssidPadding.length);
 
         int reservedBeginPosition = mHead.length + password.length + passwordPadding.length;
-        int ssidBeginPosition = reservedBeginPosition + reservedData.length + reservedPadding.length;
+        int ivBeginPosition = reservedBeginPosition + reservedData.length + reservedPadding.length;
+        int ssidBeginPosition = ivBeginPosition + aesIV.length;
         int offset = 0;
         ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
         int sequence = SEQUENCE_FIRST;
@@ -273,10 +274,14 @@ private void generate() {
                     // Password data
                     tailIsCrc = !passwordEncode;
                     expectLength = passwordPaddingFactor;
-                } else if (offset < ssidBeginPosition) {
+                } else if (offset < ivBeginPosition) {
                     // Reserved data
                     tailIsCrc = !reservedEncode;
                     expectLength = reservedPaddingFactor;
+                } else if (offset < ssidBeginPosition) {
+                    // aes iv data
+                    tailIsCrc = false;
+                    expectLength = 6;
                 } else {
                     // SSID data
                     tailIsCrc = !ssidEncode;

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip