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.

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

Jump to bottom

remove last ekt reference #677

Merged
merged 1 commit into from
Jan 9, 2024
Merged

remove last ekt reference #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions include/srtp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,6 @@ typedef struct srtp_policy_t {
/**< this stream. */
srtp_master_key_t **keys; /** Array of Master Key structures */
unsigned long num_master_keys; /** Number of master keys */
void *deprecated_ekt; /**< DEPRECATED: pointer to the EKT */
/**< policy structure for this stream */
unsigned long window_size; /**< The window size to use for replay */
/**< protection. */
int allow_repeat_tx; /**< Whether retransmissions of */
Expand Down
92 changes: 45 additions & 47 deletions srtp/srtp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,12 +344,31 @@ static srtp_err_status_t srtp_remove_and_dealloc_streams(
return data.status;
}

static srtp_err_status_t srtp_valid_policy(const srtp_policy_t *p)
static srtp_err_status_t srtp_valid_policy(const srtp_policy_t *policy)
{
if (p != NULL && p->deprecated_ekt != NULL) {
if (policy == NULL) {
return srtp_err_status_bad_param;
}

if (policy->key == NULL) {
if (policy->num_master_keys <= 0) {
return srtp_err_status_bad_param;
}

if (policy->num_master_keys > SRTP_MAX_NUM_MASTER_KEYS) {
return srtp_err_status_bad_param;
}

for (unsigned long i = 0; i < policy->num_master_keys; i++) {
if (policy->keys[i]->key == NULL) {
return srtp_err_status_bad_param;
}
if (policy->keys[i]->mki_size > SRTP_MAX_MKI_LEN) {
return srtp_err_status_bad_param;
}
}
}

return srtp_err_status_ok;
}

Expand Down Expand Up @@ -862,29 +881,6 @@ static inline size_t full_key_length(const srtp_cipher_type_t *cipher)
}
}

static unsigned int srtp_validate_policy_master_keys(
const srtp_policy_t *policy)
{
unsigned long i = 0;

if (policy->key == NULL) {
if (policy->num_master_keys <= 0)
return 0;

if (policy->num_master_keys > SRTP_MAX_NUM_MASTER_KEYS)
return 0;

for (i = 0; i < policy->num_master_keys; i++) {
if (policy->keys[i]->key == NULL)
return 0;
if (policy->keys[i]->mki_size > SRTP_MAX_MKI_LEN)
return 0;
}
}

return 1;
}

srtp_session_keys_t *srtp_get_session_keys_with_mki_index(
srtp_stream_ctx_t *stream,
unsigned int use_mki,
Expand Down Expand Up @@ -2919,16 +2915,16 @@ srtp_err_status_t srtp_stream_add(srtp_t session, const srtp_policy_t *policy)
srtp_err_status_t status;
srtp_stream_t tmp;

/* sanity check arguments */
if (session == NULL) {
return srtp_err_status_bad_param;
}

status = srtp_valid_policy(policy);
if (status != srtp_err_status_ok) {
return status;
}

/* sanity check arguments */
if ((session == NULL) || (policy == NULL) ||
(!srtp_validate_policy_master_keys(policy)))
return srtp_err_status_bad_param;

/* allocate stream */
status = srtp_stream_alloc(&tmp, policy);
if (status) {
Expand Down Expand Up @@ -2989,14 +2985,17 @@ srtp_err_status_t srtp_create(srtp_t *session, /* handle for session */
srtp_err_status_t stat;
srtp_ctx_t *ctx;

stat = srtp_valid_policy(policy);
if (stat != srtp_err_status_ok) {
return stat;
}

/* sanity check arguments */
if (session == NULL)
if (session == NULL) {
return srtp_err_status_bad_param;
}

if (policy) {
stat = srtp_valid_policy(policy);
if (stat != srtp_err_status_ok) {
return stat;
}
}

/* allocate srtp context and set ctx_ptr */
ctx = (srtp_ctx_t *)srtp_crypto_alloc(sizeof(srtp_ctx_t));
Expand Down Expand Up @@ -3066,17 +3065,16 @@ srtp_err_status_t srtp_update(srtp_t session, const srtp_policy_t *policy)
{
srtp_err_status_t stat;

/* sanity check arguments */
if (session == NULL) {
return srtp_err_status_bad_param;
}

stat = srtp_valid_policy(policy);
if (stat != srtp_err_status_ok) {
return stat;
}

/* sanity check arguments */
if ((session == NULL) || (policy == NULL) ||
(!srtp_validate_policy_master_keys(policy))) {
return srtp_err_status_bad_param;
}

while (policy != NULL) {
stat = srtp_stream_update(session, policy);
if (stat) {
Expand Down Expand Up @@ -3258,16 +3256,16 @@ srtp_err_status_t srtp_stream_update(srtp_t session,
{
srtp_err_status_t status;

/* sanity check arguments */
if (session == NULL) {
return srtp_err_status_bad_param;
}

status = srtp_valid_policy(policy);
if (status != srtp_err_status_ok) {
return status;
}

/* sanity check arguments */
if ((session == NULL) || (policy == NULL) ||
(!srtp_validate_policy_master_keys(policy)))
return srtp_err_status_bad_param;

switch (policy->ssrc.type) {
case (ssrc_any_outbound):
case (ssrc_any_inbound):
Expand Down
Loading
Loading