From 94393efada123cad7c318dc111e127c625589e08 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Thu, 13 Jun 2013 14:21:48 -0400 Subject: [PATCH] divide bit lengths by 8 to get octet count --- daemon/rtcp.c | 6 +++--- daemon/rtp.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/rtcp.c b/daemon/rtcp.c index 5be75da91..7f792f6c0 100644 --- a/daemon/rtcp.c +++ b/daemon/rtcp.c @@ -321,13 +321,13 @@ static inline int check_session_keys(struct crypto_context *c) { if (!c->crypto_suite) return -1; - str_init_len(&s, c->session_key, c->crypto_suite->session_key_len); + str_init_len(&s, c->session_key, c->crypto_suite->session_key_len / 8); if (crypto_gen_session_key(c, &s, 0x03, 4)) return -1; - str_init_len(&s, c->session_auth_key, c->crypto_suite->srtcp_auth_key_len); + str_init_len(&s, c->session_auth_key, c->crypto_suite->srtcp_auth_key_len / 8); if (crypto_gen_session_key(c, &s, 0x04, 4)) return -1; - str_init_len(&s, c->session_salt, c->crypto_suite->session_salt_len); + str_init_len(&s, c->session_salt, c->crypto_suite->session_salt_len / 8); if (crypto_gen_session_key(c, &s, 0x05, 4)) return -1; diff --git a/daemon/rtp.c b/daemon/rtp.c index c402e67d3..39404677b 100644 --- a/daemon/rtp.c +++ b/daemon/rtp.c @@ -19,13 +19,13 @@ static inline int check_session_keys(struct crypto_context *c) { if (!c->crypto_suite) goto error; - str_init_len(&s, c->session_key, c->crypto_suite->session_key_len); + str_init_len(&s, c->session_key, c->crypto_suite->session_key_len / 8); if (crypto_gen_session_key(c, &s, 0x00, 6)) goto error; - str_init_len(&s, c->session_auth_key, c->crypto_suite->srtp_auth_key_len); + str_init_len(&s, c->session_auth_key, c->crypto_suite->srtp_auth_key_len / 8); if (crypto_gen_session_key(c, &s, 0x01, 6)) goto error; - str_init_len(&s, c->session_salt, c->crypto_suite->session_salt_len); + str_init_len(&s, c->session_salt, c->crypto_suite->session_salt_len / 8); if (crypto_gen_session_key(c, &s, 0x02, 6)) goto error;