Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RMET-3403 ::: Update development with latest upsteam Version #5

Conversation

OS-ricardomoreirasilva
Copy link

@OS-ricardomoreirasilva OS-ricardomoreirasilva commented Oct 28, 2024

Description

The goal of the PR is to use the latest upstream version - 3.0.4 - with the customisations made on our side. So, the following was done:

  • Checkout upstream's 3.0.4 tag, available on the upstream/3.0.4 branch.
  • Keep all our customisations.

Context

https://outsystemsrd.atlassian.net/browse/RMET-3403

Type of changes

  • Fix (non-breaking change which fixes an issue)
  • Feature (non-breaking change which adds functionality)
  • Refactor (cosmetic changes)
  • Breaking change (change that would cause existing functionality not to work as expected)

Platforms affected

  • Android
  • iOS

Tests

Manual testing was performed to test the task.

Checklist

  • Pull request title follows the format RNMT-XXXX <title>
  • Code follows the code style of this project
  • CHANGELOG.md file is correctly updated
  • Changes require an update to the documentation
    • Documentation has been updated accordingly

nabla-c0d3 and others added 30 commits October 28, 2018 12:59
If shouldExcludeSubdomain is explicitely set to NO, it was treated the
same as YES
Fix 1 bug, and several static analysis warnings
#trivial Pod update Demo App to TrustKit 1.6
This test had an outdated pinset which caused it to fail.
Updated the pinset to include a pin from the current intermediate
CA certificate (Let's Encrypt Authority X3)
Observed behavior of TrustKit showed that, when a domain did not
have an exact match for a pinset, the first matching pinset config
with the IncludeSubdomains flag was selected. This led to
unpredictable behavior because of the nature of iterating through
dictionary keys. The change in this commit modifies TrustKit's
selection algorithm to iterate through all pinset configs and then
select the one that is the closest match (e.g, longest domain).
This matches the industry best practice set by Google in their
native Android pinning implementation, and brings TrustKit's
behavior in line with that of TrustKit-Android.
Currently TrustKit can't be packaged in a static Swift Library without modules.
"Pod package" fail if TrustKit is in other podspec dependency.
Addind this line will generate module maps for swift dependencies.
Save & load the SPKI disk cache using secure coding.
Integer overflow check in memory allocation
pawisoon and others added 15 commits April 6, 2023 13:31
Fix for Trustkit not building on Xcode 14.3 datatheorem#298
Fix for crash reported on iOS 17 (Security.framework path issue)
- Swap Cloudflare domain with Data Theorem for TSKEndToEndSwizzlingTests
- Add PrivacyInfo.xcprivacy to Xcode project for all targets
- Remove noop assign
…pstream-version

# Conflicts:
#	TrustKit.podspec
#	TrustKit.xcodeproj/project.pbxproj
#	TrustKit/Pinning/TSKSPKIHashCache.m
#	TrustKit/Pinning/pinning_utils.h
#	TrustKit/Pinning/pinning_utils.m
#	TrustKitDemo/Podfile
#	TrustKitDemo/Podfile.lock
#	TrustKitDemo/Pods/Headers/Private/TrustKit/TSKPinningValidator.h
#	TrustKitDemo/Pods/Headers/Private/TrustKit/TSKPinningValidatorCallback.h
#	TrustKitDemo/Pods/Headers/Private/TrustKit/TSKPinningValidatorResult.h
#	TrustKitDemo/Pods/Headers/Private/TrustKit/TSKTrustDecision.h
#	TrustKitDemo/Pods/Headers/Private/TrustKit/TSKTrustKitConfig.h
#	TrustKitDemo/Pods/Headers/Private/TrustKit/TrustKit.h
#	TrustKitDemo/Pods/Headers/Public/TrustKit/TSKPinningValidator.h
#	TrustKitDemo/Pods/Headers/Public/TrustKit/TSKPinningValidatorCallback.h
#	TrustKitDemo/Pods/Headers/Public/TrustKit/TSKPinningValidatorResult.h
#	TrustKitDemo/Pods/Headers/Public/TrustKit/TSKTrustDecision.h
#	TrustKitDemo/Pods/Headers/Public/TrustKit/TSKTrustKitConfig.h
#	TrustKitDemo/Pods/Headers/Public/TrustKit/TrustKit.h
#	TrustKitDemo/Pods/Local Podspecs/TrustKit.podspec.json
#	TrustKitDemo/Pods/Manifest.lock
#	TrustKitDemo/Pods/Pods.xcodeproj/project.pbxproj
#	TrustKitDemo/Pods/Target Support Files/Pods-TrustKitDemo-ObjC/Pods-TrustKitDemo-ObjC.debug.xcconfig
#	TrustKitDemo/Pods/Target Support Files/Pods-TrustKitDemo-ObjC/Pods-TrustKitDemo-ObjC.release.xcconfig
#	TrustKitDemo/Pods/Target Support Files/Pods-TrustKitDemo-Swift/Pods-TrustKitDemo-Swift-Info.plist
#	TrustKitDemo/Pods/Target Support Files/Pods-TrustKitDemo-Swift/Pods-TrustKitDemo-Swift-frameworks.sh
#	TrustKitDemo/Pods/Target Support Files/Pods-TrustKitDemo-Swift/Pods-TrustKitDemo-Swift.debug.xcconfig
#	TrustKitDemo/Pods/Target Support Files/Pods-TrustKitDemo-Swift/Pods-TrustKitDemo-Swift.release.xcconfig
#	TrustKitDemo/Pods/Target Support Files/TrustKit-framework/TrustKit-framework-Info.plist
#	TrustKitDemo/Pods/Target Support Files/TrustKit-framework/TrustKit-framework.xcconfig
#	TrustKitDemo/Pods/Target Support Files/TrustKit-library/TrustKit-library.xcconfig
#	TrustKitDemo/TrustKitDemo-ObjC/AppDelegate.m
#	TrustKitDemo/TrustKitDemo-Swift/AppDelegate.swift
#	TrustKitDemo/TrustKitDemo.xcodeproj/project.pbxproj
#	TrustKitDemo/TrustKitDemo.xcodeproj/xcshareddata/xcschemes/TrustKitDemo-ObjC.xcscheme
#	TrustKitDemo/TrustKitDemo.xcodeproj/xcshareddata/xcschemes/TrustKitDemo-Swift.xcscheme
This is the name to use when we need to import the library as a xcframework, instead of a CocoaPod.
@OS-ricardomoreirasilva OS-ricardomoreirasilva requested a review from a team as a code owner October 28, 2024 09:38
@OS-ricardomoreirasilva OS-ricardomoreirasilva requested review from ItsChaceD, IT-MikeS, alexgerardojacinto and OS-martacarlos and removed request for a team October 28, 2024 09:38
@OS-ricardomoreirasilva OS-ricardomoreirasilva marked this pull request as draft October 28, 2024 09:39
@OS-ricardomoreirasilva
Copy link
Author

OS-ricardomoreirasilva commented Oct 28, 2024

The Snyk issues can be ignored as they consider files that have been removed (and we don't have permission to remove those files' verifications).

@OS-ricardomoreirasilva OS-ricardomoreirasilva marked this pull request as ready for review October 28, 2024 10:22
@OS-ricardomoreirasilva OS-ricardomoreirasilva merged commit c9fbb3c into development Oct 28, 2024
1 of 3 checks passed
@OS-ricardomoreirasilva OS-ricardomoreirasilva deleted the chore/rmet-3403/update-to-latest-upstream-version branch October 28, 2024 17:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.