Skip to content

Commit

Permalink
Merge pull request #723 from fippo/nits-and-typos
Browse files Browse the repository at this point in the history
misc whitespace and typo fixes
  • Loading branch information
pabuhler committed Sep 3, 2024
2 parents 5f8dfbf + 98804f4 commit 2de20dd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions crypto/cipher/cipher_test_cases.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
*
*/

#ifndef CHIPHER_TEST_CASES_H
#define CHIPHER_TEST_CASES_H
#ifndef CIPHER_TEST_CASES_H
#define CIPHER_TEST_CASES_H

#ifdef HAVE_CONFIG_H
#include <config.h>
Expand Down
14 changes: 7 additions & 7 deletions srtp/srtp.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static size_t srtp_get_rtp_hdr_len(const srtp_hdr_t *hdr)
}

/*
* Returns the location of the header extention cast too a srtp_hdr_xtnd_t
* Returns the location of the header extention cast to a srtp_hdr_xtnd_t
* struct. Will always return a value and assumes that the caller has already
* verified that a header extension is present by checking the x bit of
* srtp_hdr_t.
Expand Down Expand Up @@ -1848,7 +1848,7 @@ static srtp_err_status_t srtp_protect_aead(srtp_ctx_t *ctx,
srtp_session_keys_t *session_keys)
{
const srtp_hdr_t *hdr = (const srtp_hdr_t *)rtp;
size_t enc_start; /* offset to start of encrypted portion */
size_t enc_start; /* offset to start of encrypted portion */
size_t enc_octet_len = 0; /* number of octets in encrypted portion */
srtp_xtd_seq_num_t est; /* estimated xtd_seq_num_t of *hdr */
ssize_t delta; /* delta of local pkt idx and that in hdr */
Expand Down Expand Up @@ -2202,7 +2202,7 @@ srtp_err_status_t srtp_protect(srtp_t ctx,
size_t mki_index)
{
const srtp_hdr_t *hdr = (const srtp_hdr_t *)rtp;
size_t enc_start; /* offset to start of encrypted portion */
size_t enc_start; /* offset to start of encrypted portion */
uint8_t *auth_start; /* pointer to start of auth. portion */
size_t enc_octet_len = 0; /* number of octets in encrypted portion */
srtp_xtd_seq_num_t est; /* estimated xtd_seq_num_t of *hdr */
Expand Down Expand Up @@ -2511,7 +2511,7 @@ srtp_err_status_t srtp_unprotect(srtp_t ctx,
const srtp_hdr_t *hdr = (const srtp_hdr_t *)srtp;
size_t enc_start; /* pointer to start of encrypted portion */
const uint8_t *auth_start; /* pointer to start of auth. portion */
size_t enc_octet_len = 0; /* number of octets in encrypted portion */
size_t enc_octet_len = 0; /* number of octets in encrypted portion */
const uint8_t *auth_tag = NULL; /* location of auth_tag within packet */
srtp_xtd_seq_num_t est; /* estimated xtd_seq_num_t of *hdr */
ssize_t delta; /* delta of local pkt idx and that in hdr */
Expand Down Expand Up @@ -3779,7 +3779,7 @@ static srtp_err_status_t srtp_unprotect_rtcp_aead(
size_t enc_start; /* pointer to start of encrypted portion */
const uint8_t *trailer_p; /* pointer to start of trailer */
uint32_t trailer; /* trailer value */
size_t enc_octet_len = 0; /* number of octets in encrypted portion */
size_t enc_octet_len = 0; /* number of octets in encrypted portion */
const uint8_t *auth_tag = NULL; /* location of auth_tag within packet */
srtp_err_status_t status;
size_t tag_len;
Expand Down Expand Up @@ -3980,7 +3980,7 @@ srtp_err_status_t srtp_protect_rtcp(srtp_t ctx,
uint8_t *auth_start; /* pointer to start of auth. portion */
uint8_t *trailer_p; /* pointer to start of trailer */
uint32_t trailer; /* trailer value */
size_t enc_octet_len = 0; /* number of octets in encrypted portion */
size_t enc_octet_len = 0; /* number of octets in encrypted portion */
uint8_t *auth_tag = NULL; /* location of auth_tag within packet */
srtp_err_status_t status;
size_t tag_len;
Expand Down Expand Up @@ -4221,7 +4221,7 @@ srtp_err_status_t srtp_unprotect_rtcp(srtp_t ctx,
const uint8_t *auth_start; /* pointer to start of auth. portion */
const uint8_t *trailer_p; /* pointer to start of trailer */
uint32_t trailer; /* trailer value */
size_t enc_octet_len = 0; /* number of octets in encrypted portion */
size_t enc_octet_len = 0; /* number of octets in encrypted portion */
const uint8_t *auth_tag = NULL; /* location of auth_tag within packet */
uint8_t tmp_tag[SRTP_MAX_TAG_LEN];
srtp_err_status_t status;
Expand Down

0 comments on commit 2de20dd

Please sign in to comment.