Commit c27325cc authored by Rémi Duraffort's avatar Rémi Duraffort

realrtsp: cosmetics

parent 01bde5c1
...@@ -208,8 +208,7 @@ static void hash(char *field, char *param) ...@@ -208,8 +208,7 @@ static void hash(char *field, char *param)
LE_32C(field+12, d); LE_32C(field+12, d);
} }
static void call_hash (char *key, char *challenge, int len) { static void call_hash (char *key, char *challenge, unsigned int len) {
uint8_t *ptr1, *ptr2; uint8_t *ptr1, *ptr2;
uint32_t a, b, c, d, tmp; uint32_t a, b, c, d, tmp;
...@@ -221,7 +220,7 @@ static void call_hash (char *key, char *challenge, int len) { ...@@ -221,7 +220,7 @@ static void call_hash (char *key, char *challenge, int len) {
a += len * 8; a += len * 8;
LE_32C(ptr1, a); LE_32C(ptr1, a);
if (a < (uint32_t)(len << 3)) if (a < (len << 3))
{ {
lprintf("not verified: (len << 3) > a true\n"); lprintf("not verified: (len << 3) > a true\n");
ptr2 += 4; ptr2 += 4;
...@@ -231,14 +230,14 @@ static void call_hash (char *key, char *challenge, int len) { ...@@ -231,14 +230,14 @@ static void call_hash (char *key, char *challenge, int len) {
LE_32C(ptr2, tmp); LE_32C(ptr2, tmp);
a = 64 - b; a = 64 - b;
c = 0; c = 0;
if (a <= (uint32_t)len) if (a <= len)
{ {
memcpy(key+b+24, challenge, a); memcpy(key+b+24, challenge, a);
hash(key, key+24); hash(key, key+24);
c = a; c = a;
d = c + 0x3f; d = c + 0x3f;
while ( d < (uint32_t)len ) { while ( d < len ) {
lprintf("not verified: while ( d < len )\n"); lprintf("not verified: while ( d < len )\n");
hash(key, challenge+d-0x3f); hash(key, challenge+d-0x3f);
d += 64; d += 64;
...@@ -304,7 +303,7 @@ static void calc_response_string (char *result, char *challenge) { ...@@ -304,7 +303,7 @@ static void calc_response_string (char *result, char *challenge) {
void real_calc_response_and_checksum (char *response, char *chksum, char *challenge) { void real_calc_response_and_checksum (char *response, char *chksum, char *challenge) {
int ch_len, table_len, resp_len; int ch_len, resp_len;
int i; int i;
char *ptr; char *ptr;
char buf[128]; char buf[128];
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#ifdef REALDEBUG #ifdef REALDEBUG
# define lprintf printf # define lprintf printf
#else #else
static inline void lprintf( const char *dummy, ... ){} static inline void lprintf( const char *dummy, ... ) { (void)dummy; }
#endif #endif
int real_get_rdt_chunk_header(rtsp_client_t *, rmff_pheader_t *); int real_get_rdt_chunk_header(rtsp_client_t *, rmff_pheader_t *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment