Merge pull request #341 from NordicSemiconductor/develop

Version 3.1.1
NordicSemiconductor · Mar 26, 2021 · c1bdfe9 · c1bdfe9
2 parents 5d39ed5 + f79518d
commit c1bdfe9
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Changelog
 
+- **3.1.1**:
+   - Bugfix: `SegmentedAccessMessage` overflow crash (#339).
+   - Bugfix: Validation failure if database contains 10m publish resolution (#338).
+
 - **3.1.0**:
    - Sensor messages + simple UI for reading sensor values (#327).
    - Light LC messages (#328).

diff --git a/Documentation/SETTING_UP.md b/Documentation/SETTING_UP.md
@@ -7,7 +7,7 @@ Using CocoaPods:
 You can use [Swift Package Manager](https://swift.org/package-manager/) and specify dependency in `Package.swift` by adding this:
 
 ```swift
-.package(url: "https://github.com/NordicSemiconductor/IOS-nRF-Mesh-Library", .upToNextMinor(from: "3.0.1"))
+.package(url: "https://github.com/NordicSemiconductor/IOS-nRF-Mesh-Library", .upToNextMinor(from: "3.1.1"))
 ```
 
 Also, have a look at [Swift Package Manager @ CryptoSwift](https://github.com/krzyzanowskim/CryptoSwift/blob/master/README.md#swift-package-manager).

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - CryptoSwift (1.3.8)
-  - nRFMeshProvision (3.1.0):
+  - nRFMeshProvision (3.1.1):
     - CryptoSwift (= 1.3.8)
 
 DEPENDENCIES:
@@ -16,7 +16,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   CryptoSwift: 01b0f0cba1d5c212e5a335ff6c054fb75a204f00
-  nRFMeshProvision: 65db103d9ef4f47304314349e10ea31e6148705e
+  nRFMeshProvision: c1287c0156085336176e317ac2f707541c162e4c
 
 PODFILE CHECKSUM: 69a81463322ef34ca0a20b98e90da2701d94e4ec
 

diff --git a/Example/Pods/Local Podspecs/nRFMeshProvision.podspec.json b/Example/Pods/Local Podspecs/nRFMeshProvision.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Target Support Files/nRFMeshProvision/nRFMeshProvision-Info.plist b/Example/Pods/Target Support Files/nRFMeshProvision/nRFMeshProvision-Info.plist
diff --git a/Example/nRFMeshProvision.xcodeproj/project.pbxproj b/Example/nRFMeshProvision.xcodeproj/project.pbxproj
@@ -1356,15 +1356,15 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CODE_SIGN_ENTITLEMENTS = nRFMeshProvision_Example.entitlements;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = P3R8YQEV4L;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = nRFMeshProvision/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				LINK_WITH_STANDARD_LIBRARIES = YES;
-				MARKETING_VERSION = 3.1.0;
+				MARKETING_VERSION = 3.1.1;
 				MODULE_NAME = ExampleApp;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.nordicsemi.nRFProvisioner;
@@ -1383,15 +1383,15 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CODE_SIGN_ENTITLEMENTS = nRFMeshProvision_Example.entitlements;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = P3R8YQEV4L;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = nRFMeshProvision/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				LINK_WITH_STANDARD_LIBRARIES = YES;
-				MARKETING_VERSION = 3.1.0;
+				MARKETING_VERSION = 3.1.1;
 				MODULE_NAME = ExampleApp;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.nordicsemi.nRFProvisioner;

diff --git a/nRFMeshProvision.podspec b/nRFMeshProvision.podspec
@@ -9,7 +9,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'nRFMeshProvision'
-  s.version          = '3.1.0'
+  s.version          = '3.1.1'
   s.summary          = 'A Bluetooth Mesh library'
   s.description      = <<-DESC
   nRF Mesh is a Bluetooth Mesh compliant library that has many features such as provisioning, configuration and control of Bluetooth Mesh compliant nodes.

diff --git a/nRFMeshProvision/Classes/Layers/Lower Transport Layer/SegmentedAccessMessage.swift b/nRFMeshProvision/Classes/Layers/Lower Transport Layer/SegmentedAccessMessage.swift
@@ -122,7 +122,7 @@ internal struct SegmentedAccessMessage: SegmentedMessage {
         self.sequenceZero = UInt16(pdu.sequence & 0x1FFF)
         self.segmentOffset = offset
 
-        let lowerBound = Int(offset * 12)
+        let lowerBound = Int(offset) * 12
         let upperBound = min(pdu.transportPdu.count, Int(offset + 1) * 12)
         let segment = pdu.transportPdu.subdata(in: lowerBound..<upperBound)
         self.lastSegmentNumber = UInt8((pdu.transportPdu.count + 11) / 12) - 1

diff --git a/nRFMeshProvision/Classes/Mesh Model/Publish.swift b/nRFMeshProvision/Classes/Mesh Model/Publish.swift
@@ -479,7 +479,7 @@ private extension Publish.Period {
             // If resolution or steps were set to 0, set resolution to
             // hundreds of milliseconds.
             return 100
-        case 100, 1000, 10000, 60000:
+        case 100, 1000, 10000, 600000:
             // Those are the valid values. Keep it as it is.
             return milliseconds
         case _ where milliseconds % Int(steps) == 0: