Rename key limit functions to comply with library name.
diff --git a/crypto/include/key.h b/crypto/include/key.h
index f17e086..ad7fe1f 100644
--- a/crypto/include/key.h
+++ b/crypto/include/key.h
@@ -2,31 +2,31 @@
* key.h
*
* key usage limits enforcement
- *
+ *
* David A. Mcgrew
* Cisco Systems, Inc.
*/
/*
- *
+ *
* Copyright (c) 2001-2006 Cisco Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
- *
+ *
* Neither the name of the Cisco Systems, Inc. nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -48,31 +48,31 @@
#include "rdbx.h" /* for xtd_seq_num_t */
#include "err.h"
-typedef struct key_limit_ctx_t *key_limit_t;
+typedef struct srtp_key_limit_ctx_t *srtp_key_limit_t;
typedef enum {
- key_event_normal,
- key_event_soft_limit,
- key_event_hard_limit
-} key_event_t;
+ srtp_key_event_normal,
+ srtp_key_event_soft_limit,
+ srtp_key_event_hard_limit
+} srtp_key_event_t;
-srtp_err_status_t key_limit_set(key_limit_t key, const xtd_seq_num_t s);
+srtp_err_status_t srtp_key_limit_set(srtp_key_limit_t key, const xtd_seq_num_t s);
-srtp_err_status_t key_limit_clone(key_limit_t original, key_limit_t *new_key);
+srtp_err_status_t srtp_key_limit_clone(srtp_key_limit_t original, srtp_key_limit_t *new_key);
-srtp_err_status_t key_limit_check(const key_limit_t key);
+srtp_err_status_t srtp_key_limit_check(const srtp_key_limit_t key);
-key_event_t key_limit_update(key_limit_t key);
+srtp_key_event_t srtp_key_limit_update(srtp_key_limit_t key);
-typedef enum {
- key_state_normal,
- key_state_past_soft_limit,
- key_state_expired
-} key_state_t;
+typedef enum {
+ srtp_key_state_normal,
+ srtp_key_state_past_soft_limit,
+ srtp_key_state_expired
+} srtp_key_state_t;
-typedef struct key_limit_ctx_t {
- xtd_seq_num_t num_left;
- key_state_t state;
-} key_limit_ctx_t;
+typedef struct srtp_key_limit_ctx_t {
+ xtd_seq_num_t num_left;
+ srtp_key_state_t state;
+} srtp_key_limit_ctx_t;
#endif /* KEY_H */
diff --git a/crypto/kernel/key.c b/crypto/kernel/key.c
index 9f82027..ef6201a 100644
--- a/crypto/kernel/key.c
+++ b/crypto/kernel/key.c
@@ -2,31 +2,31 @@
* key.c
*
* key usage limits enforcement
- *
+ *
* David A. Mcgrew
* Cisco Systems, Inc.
*/
/*
- *
+ *
* Copyright (c) 2001-2006 Cisco Systems, Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
- *
+ *
* Neither the name of the Cisco Systems, Inc. nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -50,70 +50,71 @@
#define soft_limit 0x10000
-srtp_err_status_t
-key_limit_set(key_limit_t key, const xtd_seq_num_t s) {
+srtp_err_status_t srtp_key_limit_set (srtp_key_limit_t key, const xtd_seq_num_t s)
+{
#ifdef NO_64BIT_MATH
- if (high32(s) == 0 && low32(s) < soft_limit)
- return srtp_err_status_bad_param;
+ if (high32(s) == 0 && low32(s) < soft_limit) {
+ return srtp_err_status_bad_param;
+ }
#else
- if (s < soft_limit)
- return srtp_err_status_bad_param;
+ if (s < soft_limit) {
+ return srtp_err_status_bad_param;
+ }
#endif
- key->num_left = s;
- key->state = key_state_normal;
- return srtp_err_status_ok;
+ key->num_left = s;
+ key->state = srtp_key_state_normal;
+ return srtp_err_status_ok;
}
-srtp_err_status_t
-key_limit_clone(key_limit_t original, key_limit_t *new_key) {
- if (original == NULL)
- return srtp_err_status_bad_param;
- *new_key = original;
- return srtp_err_status_ok;
+srtp_err_status_t srtp_key_limit_clone (srtp_key_limit_t original, srtp_key_limit_t *new_key)
+{
+ if (original == NULL) {
+ return srtp_err_status_bad_param;
+ }
+ *new_key = original;
+ return srtp_err_status_ok;
}
-srtp_err_status_t
-key_limit_check(const key_limit_t key) {
- if (key->state == key_state_expired)
- return srtp_err_status_key_expired;
- return srtp_err_status_ok;
+srtp_err_status_t srtp_key_limit_check (const srtp_key_limit_t key)
+{
+ if (key->state == srtp_key_state_expired) {
+ return srtp_err_status_key_expired;
+ }
+ return srtp_err_status_ok;
}
-key_event_t
-key_limit_update(key_limit_t key) {
+srtp_key_event_t srtp_key_limit_update (srtp_key_limit_t key)
+{
#ifdef NO_64BIT_MATH
- if (low32(key->num_left) == 0)
- {
- // carry
- key->num_left = make64(high32(key->num_left)-1,low32(key->num_left) - 1);
- }
- else
- {
- // no carry
- key->num_left = make64(high32(key->num_left),low32(key->num_left) - 1);
- }
- if (high32(key->num_left) != 0 || low32(key->num_left) >= soft_limit) {
- return key_event_normal; /* we're above the soft limit */
- }
+ if (low32(key->num_left) == 0) {
+ // carry
+ key->num_left = make64(high32(key->num_left) - 1, low32(key->num_left) - 1);
+ }else {
+ // no carry
+ key->num_left = make64(high32(key->num_left), low32(key->num_left) - 1);
+ }
+ if (high32(key->num_left) != 0 || low32(key->num_left) >= soft_limit) {
+ return srtp_key_event_normal; /* we're above the soft limit */
+ }
#else
- key->num_left--;
- if (key->num_left >= soft_limit) {
- return key_event_normal; /* we're above the soft limit */
- }
+ key->num_left--;
+ if (key->num_left >= soft_limit) {
+ return srtp_key_event_normal; /* we're above the soft limit */
+ }
#endif
- if (key->state == key_state_normal) {
- /* we just passed the soft limit, so change the state */
- key->state = key_state_past_soft_limit;
- }
+ if (key->state == srtp_key_state_normal) {
+ /* we just passed the soft limit, so change the state */
+ key->state = srtp_key_state_past_soft_limit;
+ }
#ifdef NO_64BIT_MATH
- if (low32(key->num_left) == 0 && high32(key->num_left == 0))
+ if (low32(key->num_left) == 0 && high32(key->num_left == 0))
#else
- if (key->num_left < 1)
+ if (key->num_left < 1)
#endif
- { /* we just hit the hard limit */
- key->state = key_state_expired;
- return key_event_hard_limit;
- }
- return key_event_soft_limit;
+ { /* we just hit the hard limit */
+ key->state = srtp_key_state_expired;
+ return srtp_key_event_hard_limit;
+ }
+ return srtp_key_event_soft_limit;
}
diff --git a/include/srtp_priv.h b/include/srtp_priv.h
index b7ef4f3..b5aaf3e 100644
--- a/include/srtp_priv.h
+++ b/include/srtp_priv.h
@@ -111,7 +111,7 @@
srtp_auth_t *rtcp_auth;
rdb_t rtcp_rdb;
srtp_sec_serv_t rtcp_services;
- key_limit_ctx_t *limit;
+ srtp_key_limit_ctx_t *limit;
direction_t direction;
int allow_repeat_tx;
srtp_ekt_stream_t ekt;
diff --git a/srtp/srtp.c b/srtp/srtp.c
index b443178..99769f7 100644
--- a/srtp/srtp.c
+++ b/srtp/srtp.c
@@ -155,7 +155,7 @@
}
/* allocate key limit structure */
- str->limit = (key_limit_ctx_t*) srtp_crypto_alloc(sizeof(key_limit_ctx_t));
+ str->limit = (srtp_key_limit_ctx_t*) srtp_crypto_alloc(sizeof(srtp_key_limit_ctx_t));
if (str->limit == NULL) {
auth_dealloc(str->rtp_auth);
cipher_dealloc(str->rtp_cipher);
@@ -322,7 +322,7 @@
str->rtcp_auth = stream_template->rtcp_auth;
/* set key limit to point to that of the template */
- status = key_limit_clone(stream_template->limit, &str->limit);
+ status = srtp_key_limit_clone(stream_template->limit, &str->limit);
if (status) {
srtp_crypto_free(*str_ptr);
*str_ptr = NULL;
@@ -696,10 +696,10 @@
{
uint64_t temp;
temp = make64(UINT_MAX,UINT_MAX);
- key_limit_set(srtp->limit, temp);
+ srtp_key_limit_set(srtp->limit, temp);
}
#else
- key_limit_set(srtp->limit, 0xffffffffffffLL);
+ srtp_key_limit_set(srtp->limit, 0xffffffffffffLL);
#endif
/* set the SSRC value */
@@ -900,13 +900,13 @@
* didn't just hit either the soft limit or the hard limit, and call
* the event handler if we hit either.
*/
- switch (key_limit_update(stream->limit)) {
- case key_event_normal:
+ switch (srtp_key_limit_update(stream->limit)) {
+ case srtp_key_event_normal:
break;
- case key_event_hard_limit:
+ case srtp_key_event_hard_limit:
srtp_handle_event(ctx, stream, event_key_hard_limit);
return srtp_err_status_key_expired;
- case key_event_soft_limit:
+ case srtp_key_event_soft_limit:
default:
srtp_handle_event(ctx, stream, event_key_soft_limit);
break;
@@ -1075,13 +1075,13 @@
* didn't just hit either the soft limit or the hard limit, and call
* the event handler if we hit either.
*/
- switch (key_limit_update(stream->limit)) {
- case key_event_normal:
+ switch (srtp_key_limit_update(stream->limit)) {
+ case srtp_key_event_normal:
break;
- case key_event_soft_limit:
+ case srtp_key_event_soft_limit:
srtp_handle_event(ctx, stream, event_key_soft_limit);
break;
- case key_event_hard_limit:
+ case srtp_key_event_hard_limit:
srtp_handle_event(ctx, stream, event_key_hard_limit);
return srtp_err_status_key_expired;
default:
@@ -1249,13 +1249,13 @@
* didn't just hit either the soft limit or the hard limit, and call
* the event handler if we hit either.
*/
- switch(key_limit_update(stream->limit)) {
- case key_event_normal:
+ switch(srtp_key_limit_update(stream->limit)) {
+ case srtp_key_event_normal:
break;
- case key_event_soft_limit:
+ case srtp_key_event_soft_limit:
srtp_handle_event(ctx, stream, event_key_soft_limit);
break;
- case key_event_hard_limit:
+ case srtp_key_event_hard_limit:
srtp_handle_event(ctx, stream, event_key_hard_limit);
return srtp_err_status_key_expired;
default:
@@ -1632,13 +1632,13 @@
* didn't just hit either the soft limit or the hard limit, and call
* the event handler if we hit either.
*/
- switch(key_limit_update(stream->limit)) {
- case key_event_normal:
+ switch(srtp_key_limit_update(stream->limit)) {
+ case srtp_key_event_normal:
break;
- case key_event_soft_limit:
+ case srtp_key_event_soft_limit:
srtp_handle_event(ctx, stream, event_key_soft_limit);
break;
- case key_event_hard_limit:
+ case srtp_key_event_hard_limit:
srtp_handle_event(ctx, stream, event_key_hard_limit);
return srtp_err_status_key_expired;
default: