RDKB-58489: Add AES+GCMP EncryptionMethod to TR-181 #154
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
Reason for change: making it possible to use GCMP encryption method Test Procedure: set Device.WiFi.AccessPoint.1.Security.X_CISCO_COM_EncryptionMethod to "AES+GCMP" (e.g. by using dmcli command) Risks: Low Priority: P1
takahawk
force-pushed
the
feature/add-aes-gcmp-encryption-method
branch
from
68a3af6 to
6b2f6a2
Compare
gsathish86
requested changes
Feb 25, 2025
Comment on lines
190
to
201
| <<<<<<< ours | ||
| { wifi_encryption_none, "NONE" }, | ||
| { wifi_encryption_tkip, "TKIP" }, | ||
| { wifi_encryption_aes, "AES" }, | ||
| { wifi_encryption_aes_tkip, "AES+TKIP" } | ||
| ======= | ||
| { wifi_encryption_none, "NONE" }, | ||
| { wifi_encryption_tkip, "TKIP" }, | ||
| { wifi_encryption_aes, "AES" }, | ||
| { wifi_encryption_aes_tkip, "AES+TKIP" }, | ||
| { wifi_encryption_aes_gcmp256, "AES+GCMP" } | ||
| >>>>>>> theirs |
Comment on lines
220
to
231
| <<<<<<< ours | ||
| { wifi_encryption_none, "NONE" }, | ||
| { wifi_encryption_tkip, "TKIP" }, | ||
| { wifi_encryption_aes, "AES" }, | ||
| { wifi_encryption_aes_tkip, "AES+TKIP" } | ||
| ======= | ||
| { wifi_encryption_none, "NONE" }, | ||
| { wifi_encryption_tkip, "TKIP" }, | ||
| { wifi_encryption_aes, "AES" }, | ||
| { wifi_encryption_aes_tkip, "AES+TKIP" }, | ||
| { wifi_encryption_aes_gcmp256, "AES+GCMP" } | ||
| >>>>>>> theirs |
There was a problem hiding this comment.
Resolve merge conflict. Choose theirs as final code change.
gsathish86
reviewed
Mar 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reason for change: making it possible to use GCMP encryption method
Test Procedure: set Device.WiFi.AccessPoint.1.Security.X_CISCO_COM_EncryptionMethod to "AES+GCMP" (e.g. by using dmcli command)
Risks: Low
Priority: P1