Skip to content

backport cryptex to v2 branch #778

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.

Sign up for GitHub

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

Open
pabuhler wants to merge 2 commits into
base: 2_x_dev
Choose a base branch
from
Open

backport cryptex to v2 branch #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae906a3
backport cryptex to v2 branch
pabuhler Nov 23, 2025
b456da9
Add cryptex setter API to avoid srtp_policy_t ABI change
pabuhler Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion include/srtp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,9 @@ typedef enum {
/**< invalid */
srtp_err_status_pkt_idx_old = 26, /**< packet index is too old to */
/**< consider */
srtp_err_status_pkt_idx_adv = 27 /**< packet index advanced, reset */
srtp_err_status_pkt_idx_adv = 27, /**< packet index advanced, reset */
/**< needed */
srtp_err_status_cryptex_err = 28 /**< cryptex error */
Copy link
Contributor

@bifurcation bifurcation Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is only used in once place, let's document more clearly.

Suggested change
srtp_err_status_cryptex_err = 28 /**< cryptex error */
srtp_err_status_cryptex_err = 28 /**< cryptex with CSRC and no header */

Copy link
Member Author

@pabuhler pabuhler Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it main it can be returned for different reasons but I am ok with this

} srtp_err_status_t;

typedef struct srtp_ctx_t_ srtp_ctx_t;
Expand Down Expand Up @@ -1746,6 +1747,22 @@ srtp_err_status_t srtp_get_stream_roc(srtp_t session,
uint32_t ssrc,
uint32_t *roc);

/**
* @brief srtp_set_stream_use_cryptex(session, ssrc)
*
* Enable cryptex processing for the stream identified by the given SSRC. For
Copy link
Contributor

@bifurcation bifurcation Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would reference RFC 9335 somewhere in this doc comment.

* wildcard SSRC types the cryptex setting is applied to the session template
* and any streams created from it.
*
* @param session is the SRTP session containing the stream to update.
* @param ssrc describes the SSRC to enable cryptex for.
*
* @returns srtp_err_status_ok on success, or srtp_err_status_bad_param if the
* stream or template cannot be found for the given SSRC.
*/
srtp_err_status_t srtp_set_stream_use_cryptex(srtp_t session,
const srtp_ssrc_t *ssrc);

/**
* @}
*/
Expand Down
1 change: 1 addition & 0 deletions include/srtp_priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ typedef struct srtp_stream_ctx_t_ {
int allow_repeat_tx;
int *enc_xtn_hdr;
int enc_xtn_hdr_count;
int use_cryptex;
uint32_t pending_roc;
/*
The next and prev pointers are here to allow for a stream list to be
Expand Down
Loading
Loading