summaryrefslogtreecommitdiff
path: root/third_party/srtp/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/srtp/crypto')
-rw-r--r--third_party/srtp/crypto/cipher/cipher.c2
-rw-r--r--third_party/srtp/crypto/include/cipher.h4
-rw-r--r--third_party/srtp/crypto/math/datatypes.c5
3 files changed, 5 insertions, 6 deletions
diff --git a/third_party/srtp/crypto/cipher/cipher.c b/third_party/srtp/crypto/cipher/cipher.c
index b5ef1645..489a52d9 100644
--- a/third_party/srtp/crypto/cipher/cipher.c
+++ b/third_party/srtp/crypto/cipher/cipher.c
@@ -269,7 +269,7 @@ cipher_type_self_test(const cipher_type_t *ct) {
for (j=0; j < NUM_RAND_TESTS; j++) {
unsigned length;
- int plaintext_len;
+ unsigned plaintext_len;
uint8_t key[MAX_KEY_LEN];
uint8_t iv[MAX_KEY_LEN];
diff --git a/third_party/srtp/crypto/include/cipher.h b/third_party/srtp/crypto/include/cipher.h
index 96ee9dc3..f485660c 100644
--- a/third_party/srtp/crypto/include/cipher.h
+++ b/third_party/srtp/crypto/include/cipher.h
@@ -127,9 +127,9 @@ typedef struct cipher_test_case_t {
int key_length_octets; /* octets in key */
uint8_t *key; /* key */
uint8_t *idx; /* packet index */
- int plaintext_length_octets; /* octets in plaintext */
+ unsigned int plaintext_length_octets; /* octets in plaintext */
uint8_t *plaintext; /* plaintext */
- int ciphertext_length_octets; /* octets in plaintext */
+ unsigned int ciphertext_length_octets; /* octets in plaintext */
uint8_t *ciphertext; /* ciphertext */
struct cipher_test_case_t *next_test_case; /* pointer to next testcase */
} cipher_test_case_t;
diff --git a/third_party/srtp/crypto/math/datatypes.c b/third_party/srtp/crypto/math/datatypes.c
index 61bf34fe..331aed8b 100644
--- a/third_party/srtp/crypto/math/datatypes.c
+++ b/third_party/srtp/crypto/math/datatypes.c
@@ -149,10 +149,9 @@ hex_char_to_nibble(uint8_t c) {
case ('E'): return 0xe;
case ('f'): return 0xf;
case ('F'): return 0xf;
- default: return -1; /* this flags an error */
+ default: break; /* this flags an error */
}
- /* NOTREACHED */
- return -1; /* this keeps compilers from complaining */
+ return -1;
}
int