-
Notifications
You must be signed in to change notification settings - Fork 482
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
Add support for cryptex #511
Open
murillo128
wants to merge
22
commits into
cisco:main
Choose a base branch
from
murillo128:cryptex
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+995
−29
Open
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
9063d2e
WIP
murillo128 95b0e97
replace memmove by for loop
murillo128 62bf7a8
cryptex in aead
murillo128 4939886
fix csrcs type
murillo128 e16a815
cyrptex -> cryptex
murillo128 664da14
fix test/srtp_driver structs
murillo128 6fa8d3b
Merge branch 'cryptex' of https://github.com/murillo128/libsrtp into …
murillo128 3fe608b
clang-format
murillo128 696ae82
remove tabs
murillo128 4ab5255
[wip]
murillo128 ce58dd6
Fix AAD and add tests
murillo128 6536373
format
murillo128 fbf23e2
clang
murillo128 f09a939
Merge pull request #1 from murillo128/master
murillo128 3f21c3e
fix warnings
murillo128 5124a97
rename policy.ekt to policy.deprecated_ekt to aling with master
murillo128 f8a374b
fix format
murillo128 90d2345
fix mem leak on deallocating recv sessions
murillo128 f1ab8cc
Merge branch murillo128:cryptex
pabuhler 7e43bc5
enable cryptex support
pabuhler 7ed0ea9
Merge 'origin/main'
pabuhler 8821982
add test for cryptex with no hdr xtn
pabuhler File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -216,6 +216,7 @@ typedef enum { | |
srtp_err_status_pkt_idx_adv = 27, /**< packet index advanced, reset */ | ||
/**< needed */ | ||
srtp_err_status_buffer_small = 28, /**< out buffer is too small */ | ||
srtp_err_status_cryptex_err = 29, /**< unsupported cryptex operation */ | ||
} srtp_err_status_t; | ||
|
||
typedef struct srtp_ctx_t_ srtp_ctx_t; | ||
|
@@ -351,6 +352,8 @@ typedef struct srtp_policy_t { | |
uint8_t *enc_xtn_hdr; /**< List of header ids to encrypt. */ | ||
size_t enc_xtn_hdr_count; /**< Number of entries in list of header */ | ||
/**< ids. */ | ||
bool use_cryptex; /**< Encrypt header block and CSRCS with */ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Make the last |
||
/**< cryptex. */ | ||
struct srtp_policy_t *next; /**< Pointer to next stream policy. */ | ||
} srtp_policy_t; | ||
|
||
|
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rather than adding this error, why not just disable extension encryption of extensions are not present?