summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-09 21:34:20 +0000
committerrtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-09 21:34:20 +0000
commit350e6eef26bad403b0fe3c9b183a879e563e70f2 (patch)
tree3fb4c106c71efc9bee8baf460db3f8f4716ecc6f
parent2213c30ac23f1dd2dbb82eff917ec83538db6b6a (diff)
downloadmpv-350e6eef26bad403b0fe3c9b183a879e563e70f2.tar.bz2
mpv-350e6eef26bad403b0fe3c9b183a879e563e70f2.tar.xz
Merge calc_response_string() into real_calc_response_and_checksum()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22962 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--stream/realrtsp/real.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/stream/realrtsp/real.c b/stream/realrtsp/real.c
index b11b2a7faa..76430a2366 100644
--- a/stream/realrtsp/real.c
+++ b/stream/realrtsp/real.c
@@ -84,24 +84,13 @@ static void hexdump (const char *buf, int length) {
#endif
-static void calc_response_string (char *result, char *challenge) {
-
- unsigned char zres[16];
- int i;
-
- av_md5_sum(zres, challenge, 64);
-
- /* convert zres to ascii string */
- for (i=0; i<16; i++ )
- sprintf(result+i*2, "%02x", zres[i]);
-}
-
static void real_calc_response_and_checksum (char *response, char *chksum, char *challenge) {
int ch_len;
int i;
char *ptr;
char buf[128];
+ unsigned char zres[16];
/* initialize return values */
memset(response, 0, 64);
@@ -135,7 +124,11 @@ static void real_calc_response_and_checksum (char *response, char *chksum, char
for (i=0; i<XOR_TABLE_SIZE; i++)
ptr[i] = ptr[i] ^ xor_table[i];
- calc_response_string (response, buf);
+ av_md5_sum(zres, buf, 64);
+
+ /* convert zres to ascii string */
+ for (i=0; i<16; i++ )
+ sprintf(response+i*2, "%02x", zres[i]);
/* add tail */
strcpy (&response[32], "01d0a8e3");