Merge branch 'bugfix/start_scan_response_handling' into 'master'

Bugfix: Fixed the code that decrypts the response from device for the network scan start. See merge request idf/esp-idf-provisioning-ios!45
espressif · Aug 8, 2024 · 40344b2 · 40344b2
2 parents 09dbf1d + 41c2e0e
commit 40344b2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/ESPProvision.podspec b/ESPProvision.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
 
   spec.name         = "ESPProvision"
-  spec.version      = "3.0.0"
+  spec.version      = "3.0.1"
   spec.summary      = "ESP-IDF provisioning in Swift"
   spec.description  = "It provides mechanism to provide network credentials and/or custom data to an ESP32, ESP32-S2 or ESP8266 devices"
   spec.homepage     = "https://github.com/espressif/esp-idf-provisioning-ios"

diff --git a/ESPProvision/ESPThreadManager.swift b/ESPProvision/ESPThreadManager.swift
@@ -61,7 +61,7 @@ class ESPThreadManager {
     }
 
     private func processStartScan(responseData: Data) {
-        let decryptedResponse = (security.encrypt(data: responseData))!
+        let decryptedResponse = (security.decrypt(data: responseData))!
         do {
             _ = try NetworkScanPayload(serializedData: decryptedResponse)
         } catch {

diff --git a/ESPProvision/ESPWiFiManager.swift b/ESPProvision/ESPWiFiManager.swift
@@ -61,7 +61,7 @@ class ESPWiFiManager {
     }
 
     private func processStartScan(responseData: Data) {
-        let decryptedResponse = (security.encrypt(data: responseData))!
+        let decryptedResponse = (security.decrypt(data: responseData))!
         do {
             _ = try NetworkScanPayload(serializedData: decryptedResponse)
         } catch {

diff --git a/Example/ESPProvisionSPMSample/ESPProvisionSPMSample.xcodeproj/project.pbxproj b/Example/ESPProvisionSPMSample/ESPProvisionSPMSample.xcodeproj/project.pbxproj
@@ -672,7 +672,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.espressif.ESPProvisionSPMSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -713,7 +713,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.espressif.ESPProvisionSPMSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/Example/ESPProvisionSample/ESPProvisionSample.xcodeproj/project.pbxproj b/Example/ESPProvisionSample/ESPProvisionSample.xcodeproj/project.pbxproj
@@ -737,7 +737,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.espressif.provsoftap;
 				PRODUCT_NAME = "ESP PROV Debug";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -771,7 +771,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.espressif.provsoftap;
 				PRODUCT_NAME = "ESP PROV Release";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -948,7 +948,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.espressif.provble;
 				PRODUCT_NAME = "ESP BLE Prov";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1081,7 +1081,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.espressif.provsoftap;
 				PRODUCT_NAME = "ESP SoftAP Prov";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Example/ESPProvisionSample/Podfile b/Example/ESPProvisionSample/Podfile
@@ -6,7 +6,7 @@ target 'ESPProvisionSample' do
   use_frameworks!
 
   # Pods for ESPProvisionSample
-  pod 'ESPProvision', '3.0.0'
+  pod 'ESPProvision', '3.0.1'
   pod 'MBProgressHUD'
 
   target 'ESPProvisionSampleTests' do