From 8c000ebfa00eb4143d04b2fc9972010d5b2f58b4 Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Sat, 24 Aug 2024 19:42:44 -0700 Subject: [PATCH 1/2] fix whitespace --- srtp/srtp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srtp/srtp.c b/srtp/srtp.c index 711e4c322..1f9322b83 100644 --- a/srtp/srtp.c +++ b/srtp/srtp.c @@ -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 */ @@ -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 */ @@ -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 */ @@ -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; @@ -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; @@ -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; From 98804f4129f0bd95d5dee9f10b4d10faa23e9230 Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Sun, 1 Sep 2024 12:19:20 -0700 Subject: [PATCH 2/2] fix moar typos --- crypto/cipher/cipher_test_cases.h | 4 ++-- srtp/srtp.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/cipher/cipher_test_cases.h b/crypto/cipher/cipher_test_cases.h index c8a928400..3c5d54c49 100644 --- a/crypto/cipher/cipher_test_cases.h +++ b/crypto/cipher/cipher_test_cases.h @@ -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 diff --git a/srtp/srtp.c b/srtp/srtp.c index 1f9322b83..5236a525f 100644 --- a/srtp/srtp.c +++ b/srtp/srtp.c @@ -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.