October 2012 - rtmpdump - lists.mplayerhq.hu

core dump in rtmpsrv
by Kristian Erik Hermansen 31 Oct '12

31 Oct '12

Trunk release built today is causing core dump in rtmpsrv with my test case. I have used rtmpsrv successfully many times previously using the stable 2.4 release. Looks like a memory management bug to me, but I could also be missing something entirely. The latest stable builds will not work for me since I am looking to leverage the new functionality for additional RTMP types / codes... System / Program info: """ $ lsb_release -idrc Distributor ID: Ubuntu Description: Ubuntu 12.10 Release: 12.10 Codename: quantal $ uname -a Linux svzu 3.5.0-18-generic #29-Ubuntu SMP Fri Oct 19 10:26:51 UTC 2012 x86_64 x86_64 x86_64 GNU/Linux $ file rtmpsrv rtmpsrv: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked (uses shared libs), for GNU/Linux 2.6.24, BuildID[sha1]=0xc5ef3983df3c92592432d8e7b5569f340bdbbba9, not stripped """ Runtime: """ $ ./rtmpsrv RTMP Server v2.4 (c) 2010 Andrej Stepanchuk, Howard Chu; license: GPL Streaming on rtmp://0.0.0.0:1935 Segmentation fault (core dumped) """ Debugging: """ $ gdb rtmpsrv core GNU gdb (GDB) 7.5-ubuntu ... This GDB was configured as "x86_64-linux-gnu". ... Core was generated by `./rtmpsrv'. Program terminated with signal 11, Segmentation fault. #0 0x00007f5285f3a4f4 in RTMPPacket_Free () from /usr/lib/x86_64-linux-gnu/librtmp.so.0 (gdb) bt #0 0x00007f5285f3a4f4 in RTMPPacket_Free () from /usr/lib/x86_64-linux-gnu/librtmp.so.0 #1 0x00007f5285f3be9d in RTMP_Close () from /usr/lib/x86_64-linux-gnu/librtmp.so.0 #2 0x00007f5285f3dae6 in ?? () from /usr/lib/x86_64-linux-gnu/librtmp.so.0 #3 0x00007f5285f3db6c in ?? () from /usr/lib/x86_64-linux-gnu/librtmp.so.0 #4 0x00000000004039a4 in doServe (server=server@entry=0x15b5160, sockfd=sockfd@entry=4) at rtmpsrv.c:906 #5 0x0000000000403b94 in serverThread (arg=0x15b5160) at rtmpsrv.c:974 #6 0x00007f5286155e9a in start_thread () from /lib/x86_64-linux-gnu/libpthread.so.0 #7 0x00007f5285c68cbd in clone () from /lib/x86_64-linux-gnu/libc.so.6 #8 0x0000000000000000 in ?? () (gdb) info stack #0 0x00007f5285f3a4f4 in RTMPPacket_Free () from /usr/lib/x86_64-linux-gnu/librtmp.so.0 #1 0x00007f5285f3be9d in RTMP_Close () from /usr/lib/x86_64-linux-gnu/librtmp.so.0 #2 0x00007f5285f3dae6 in ?? () from /usr/lib/x86_64-linux-gnu/librtmp.so.0 #3 0x00007f5285f3db6c in ?? () from /usr/lib/x86_64-linux-gnu/librtmp.so.0 #4 0x00000000004039a4 in doServe (server=server@entry=0x15b5160, sockfd=sockfd@entry=4) at rtmpsrv.c:906 #5 0x0000000000403b94 in serverThread (arg=0x15b5160) at rtmpsrv.c:974 #6 0x00007f5286155e9a in start_thread () from /lib/x86_64-linux-gnu/libpthread.so.0 #7 0x00007f5285c68cbd in clone () from /lib/x86_64-linux-gnu/libc.so.6 #8 0x0000000000000000 in ?? () (gdb) info registers rax 0x0 0 rbx 0x4 4 rcx 0x10 16 rdx 0x1 1 rsi 0x7f5285cea420 139992408957984 rdi 0x4 4 rbp 0x10027 0x10027 rsp 0x7f52843f3a20 0x7f52843f3a20 r8 0x10 16 r9 0x0 0 r10 0x7f52843f37c0 139992382781376 r11 0x7f5285f3a4f0 139992411383024 r12 0x7f527c0008c0 139992244422848 r13 0x0 0 r14 0x7f52843f3aef 139992382782191 r15 0x3 3 rip 0x7f5285f3a4f4 0x7f5285f3a4f4 <RTMPPacket_Free+4> eflags 0x10202 [ IF RF ] cs 0x33 51 ss 0x2b 43 ds 0x0 0 es 0x0 0 fs 0x0 0 gs 0x0 0 (gdb) ... """

4 6

Won't cross-compile with Polarssl >= 1.1.0
by bat guano 30 Oct '12

30 Oct '12

Hi I've tried to cross-compile "f3e3e6b" with mingw. It's OK with Polarssl-1.0.0. But it won't compile for me with Polarssl >= 1.1.0. There's an error message:- dh.h:67:43: error: ‘havege_rand’ undeclared (first use in this function) I've attached build results with Polarssl-1.0.0 and Polarssl-1.1.0.

2 2

branch master updated. e79a07c PolarSSL version fixes
by gil＠avcodec.org 30 Oct '12

30 Oct '12

The branch, master has been updated via e79a07c8625b56ebb182c12343518faff4902de7 (commit) from f3e3e6b507ac0df89a11764abd15cc9535593735 (commit) - Log ----------------------------------------------------------------- commit e79a07c8625b56ebb182c12343518faff4902de7 Author: Howard Chu <hyc(a)highlandsun.com> AuthorDate: Tue Oct 30 14:40:14 2012 -0700 Commit: Howard Chu <hyc(a)highlandsun.com> CommitDate: Tue Oct 30 14:40:14 2012 -0700 PolarSSL version fixes Fix commit a312ac7770207bd7d07725c1aef43725206e803a diff --git a/librtmp/dh.h b/librtmp/dh.h index fa264f8..e29587b 100644 --- a/librtmp/dh.h +++ b/librtmp/dh.h @@ -29,9 +29,6 @@ #ifdef USE_POLARSSL #include <polarssl/dhm.h> -#if POLARSSL_VERSION_NUMBER < 0x01010100 -#define havege_random havege_rand -#endif typedef mpi * MP_t; #define MP_new(m) m = malloc(sizeof(mpi)); mpi_init(m) #define MP_set_w(mpi, w) mpi_lset(mpi, w) diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index d72f105..720669e 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -34,7 +34,6 @@ #ifdef CRYPTO #ifdef USE_POLARSSL -#include <polarssl/version.h> #include <polarssl/havege.h> #include <polarssl/md5.h> #include <polarssl/base64.h> @@ -2435,7 +2434,7 @@ static int b64enc(const unsigned char *input, int length, char *output, int maxsize) { #ifdef USE_POLARSSL - int buf_size = maxsize; + size_t buf_size = maxsize; if(base64_encode((unsigned char *) output, &buf_size, input, length) == 0) { output[buf_size] = '\0'; @@ -2481,7 +2480,7 @@ b64enc(const unsigned char *input, int length, char *output, int maxsize) #ifdef USE_POLARSSL #define MD5_CTX md5_context #define MD5_Init(ctx) md5_starts(ctx) -#define MD5_Update(ctx,data,len) md5_update(ctx,data,len) +#define MD5_Update(ctx,data,len) md5_update(ctx,(unsigned char *)data,len) #define MD5_Final(dig,ctx) md5_finish(ctx,dig) #elif defined(USE_GNUTLS) typedef struct md5_ctx MD5_CTX diff --git a/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h index 2cdb705..6e2356a 100644 --- a/librtmp/rtmp_sys.h +++ b/librtmp/rtmp_sys.h @@ -65,7 +65,7 @@ #include <polarssl/net.h> #include <polarssl/ssl.h> #include <polarssl/havege.h> -#if POLARSSL_VERSION_NUMBER < 0x01010100 +#if POLARSSL_VERSION_NUMBER < 0x01010000 #define havege_random havege_rand #endif typedef struct tls_ctx { @@ -88,7 +88,7 @@ typedef struct tls_server_ctx { ssl_set_session(s, 1, 600, &ctx->ssn) #define TLS_server(ctx,s) s = malloc(sizeof(ssl_context)); ssl_init(s);\ ssl_set_endpoint(s, SSL_IS_SERVER); ssl_set_authmode(s, SSL_VERIFY_NONE);\ - ssl_set_rng(s, havege_rand, ((tls_server_ctx*)ctx)->hs);\ + ssl_set_rng(s, havege_random, ((tls_server_ctx*)ctx)->hs);\ ssl_set_ciphersuites(s, ssl_default_ciphersuites);\ ssl_set_session(s, 1, 600, &((tls_server_ctx*)ctx)->ssn);\ ssl_set_own_cert(s, &((tls_server_ctx*)ctx)->cert, &((tls_server_ctx*)ctx)->key);\ ----------------------------------------------------------------------- Summary of changes: librtmp/dh.h | 3 --- librtmp/rtmp.c | 5 ++--- librtmp/rtmp_sys.h | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) hooks/post-receive --

1 0

[PATCH] Look for a fourth slash when splitting the url into app+playpath
by Martin Storsjo 30 Oct '12

30 Oct '12

From: Björn Axelsson <bjorn.axelsson(a)intinor.se> --- librtmp/parseurl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/librtmp/parseurl.c b/librtmp/parseurl.c index 0183958..646c70c 100644 --- a/librtmp/parseurl.c +++ b/librtmp/parseurl.c @@ -137,12 +137,14 @@ parsehost: * application = app[/appinstance] */ - char *slash2, *slash3 = NULL; + char *slash2, *slash3 = NULL, *slash4 = NULL; int applen, appnamelen; slash2 = strchr(p, '/'); if(slash2) slash3 = strchr(slash2+1, '/'); + if(slash3) + slash4 = strchr(slash3+1, '/'); applen = end-p; /* ondemand, pass all parameters as app */ appnamelen = applen; /* ondemand length */ @@ -156,7 +158,9 @@ parsehost: appnamelen = 8; } else { /* app!=ondemand, so app is app[/appinstance] */ - if(slash3) + if(slash4) + appnamelen = slash4-p; + else if(slash3) appnamelen = slash3-p; else if(slash2) appnamelen = slash2-p; -- 1.7.9.4

2 2

Pull request: -objEnc opt flag for rtmpdump
by Foy Savas 30 Oct '12

30 Oct '12

I was recently dumping some videos for a client and found a major CDN disconnecting on me after streaming just a small bit of content. After extensively diff-ing the packet exchanges from rtmpdump with that of a working SWF through rtmpsuck, the only major difference was the SWF specifying AMF3 objectEncoding on connect. As odd as that may sound, when I forced rtmpdump to connect specifying AMF3, I no longer received any peer disconnects. Just in case others run into this same problem, here's a link to a commit modifying rtmpdump to more readily set objectEncoding via opt flag: https://github.com/foysavas/rtmpdump/commit/2c2ae7b79251c72303c4f4b1d94c8a2… Best, Foy

2 2

branch master updated. f3e3e6b Look for a fourth slash when splitting the url into app+playpath
by gil＠avcodec.org 30 Oct '12

30 Oct '12

The branch, master has been updated via f3e3e6b507ac0df89a11764abd15cc9535593735 (commit) via 9d6dc72d7c43554dbe8cdb02f450807230df8c25 (commit) via 1f6c6434d6794b3ba14540a141bab358eba48b13 (commit) from e42b5d0926b1a668d7fbd794a70f31040c5f198d (commit) - Log ----------------------------------------------------------------- commit f3e3e6b507ac0df89a11764abd15cc9535593735 Author: Björn Axelsson <bjorn.axelsson(a)intinor.se> AuthorDate: Tue Oct 30 19:31:01 2012 +0200 Commit: Howard Chu <hyc(a)highlandsun.com> CommitDate: Tue Oct 30 11:30:26 2012 -0700 Look for a fourth slash when splitting the url into app+playpath diff --git a/librtmp/parseurl.c b/librtmp/parseurl.c index 0183958..646c70c 100644 --- a/librtmp/parseurl.c +++ b/librtmp/parseurl.c @@ -137,12 +137,14 @@ parsehost: * application = app[/appinstance] */ - char *slash2, *slash3 = NULL; + char *slash2, *slash3 = NULL, *slash4 = NULL; int applen, appnamelen; slash2 = strchr(p, '/'); if(slash2) slash3 = strchr(slash2+1, '/'); + if(slash3) + slash4 = strchr(slash3+1, '/'); applen = end-p; /* ondemand, pass all parameters as app */ appnamelen = applen; /* ondemand length */ @@ -156,7 +158,9 @@ parsehost: appnamelen = 8; } else { /* app!=ondemand, so app is app[/appinstance] */ - if(slash3) + if(slash4) + appnamelen = slash4-p; + else if(slash3) appnamelen = slash3-p; else if(slash2) appnamelen = slash2-p; commit 9d6dc72d7c43554dbe8cdb02f450807230df8c25 Author: Martin Storsjo <martin(a)martin.st> AuthorDate: Tue Oct 30 19:22:16 2012 +0200 Commit: Howard Chu <hyc(a)highlandsun.com> CommitDate: Tue Oct 30 11:30:26 2012 -0700 Simplify initializing the TLS server context This does the same thing, but I wasn't aware of these functions when I initially wrote this. diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 4858e24..d72f105 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -280,32 +280,14 @@ RTMP_TLS_AllocServerContext(const char* cert, const char* key) } #elif !defined(NO_SSL) /* USE_OPENSSL */ ctx = SSL_CTX_new(SSLv23_server_method()); - FILE *f = fopen(key, "r"); - if (!f) { + if (!SSL_CTX_use_certificate_chain_file(ctx, cert)) { SSL_CTX_free(ctx); return NULL; } - EVP_PKEY *k = PEM_read_PrivateKey(f, NULL, NULL, NULL); - fclose(f); - if (!k) { + if (!SSL_CTX_use_PrivateKey_file(ctx, key, SSL_FILETYPE_PEM)) { SSL_CTX_free(ctx); return NULL; } - SSL_CTX_use_PrivateKey(ctx, k); - EVP_PKEY_free(k); - f = fopen(cert, "r"); - if (!f) { - SSL_CTX_free(ctx); - return NULL; - } - X509 *c = PEM_read_X509(f, NULL, NULL, NULL); - fclose(f); - if (!c) { - SSL_CTX_free(ctx); - return NULL; - } - SSL_CTX_use_certificate(ctx, c); - X509_free(c); #endif #endif return ctx; commit 1f6c6434d6794b3ba14540a141bab358eba48b13 Author: Howard Chu <hyc(a)highlandsun.com> AuthorDate: Tue Oct 30 11:30:07 2012 -0700 Commit: Howard Chu <hyc(a)highlandsun.com> CommitDate: Tue Oct 30 11:30:26 2012 -0700 More authentication cleanup diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 6d04708..4858e24 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -2512,15 +2512,14 @@ typedef struct md5_ctx MD5_CTX static const AVal av_authmod_adobe = AVC("authmod=adobe"); static const AVal av_authmod_llnw = AVC("authmod=llnw"); -static char *hexenc(unsigned char *inbuf, int len) +static void hexenc(unsigned char *inbuf, int len, char *dst) { - char *dst = malloc(len * 2 + 1), *ptr = dst; + char *ptr = dst; while(len--) { sprintf(ptr, "%02x", *inbuf++); ptr += 2; } *ptr = '\0'; - return dst; } static int @@ -2723,7 +2722,7 @@ PublisherAuth(RTMP *r, AVal *description) { char *orig_ptr; char *par, *val = NULL; - char *hash1, *hash2, *hash3; + char hash1[HEXHASH_LEN+1], hash2[HEXHASH_LEN+1], hash3[HEXHASH_LEN+1]; AVal user, nonce, *aptr = NULL; AVal apptmp; @@ -2790,7 +2789,7 @@ PublisherAuth(RTMP *r, AVal *description) RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s:%s:%s) =>", __FUNCTION__, user.av_val, realm, r->Link.pubPasswd.av_val); RTMP_LogHexString(RTMP_LOGDEBUG, md5sum_val, MD5_DIGEST_LENGTH); - hash1 = hexenc(md5sum_val, MD5_DIGEST_LENGTH); + hexenc(md5sum_val, MD5_DIGEST_LENGTH, hash1); /* hash2 = hexenc(md5(method + ":/" + app + "/" + appInstance)) */ /* Extract appname + appinstance without query parameters */ @@ -2807,7 +2806,7 @@ PublisherAuth(RTMP *r, AVal *description) RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s:/%.*s) =>", __FUNCTION__, method, apptmp.av_len, apptmp.av_val); RTMP_LogHexString(RTMP_LOGDEBUG, md5sum_val, MD5_DIGEST_LENGTH); - hash2 = hexenc(md5sum_val, MD5_DIGEST_LENGTH); + hexenc(md5sum_val, MD5_DIGEST_LENGTH, hash2); /* hash3 = hexenc(md5(hash1 + ":" + nonce + ":" + nchex + ":" + cnonce + ":" + qop + ":" + hash2)) */ MD5_Init(&md5ctx); @@ -2826,7 +2825,7 @@ PublisherAuth(RTMP *r, AVal *description) RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s:%s:%s:%s:%s:%s) =>", __FUNCTION__, hash1, nonce.av_val, nchex, cnonce, qop, hash2); RTMP_LogHexString(RTMP_LOGDEBUG, md5sum_val, MD5_DIGEST_LENGTH); - hash3 = hexenc(md5sum_val, MD5_DIGEST_LENGTH); + hexenc(md5sum_val, MD5_DIGEST_LENGTH, hash3); /* pubToken = &authmod=<authmod>&user=<username>&nonce=<nonce>&cnonce=<cnonce>&nc=<nchex>&response=<hash3> */ /* Append nonces and response to query string which already contains @@ -2839,9 +2838,6 @@ PublisherAuth(RTMP *r, AVal *description) RTMP_Log(RTMP_LOGDEBUG, "%s, pubToken2: %s", __FUNCTION__, pubToken.av_val); r->Link.pFlags |= RTMP_PUB_RESP|RTMP_PUB_CLATE; - free(hash1); - free(hash2); - free(hash3); free(orig_ptr); } else if(strstr(description->av_val, "?reason=authfail") != NULL) ----------------------------------------------------------------------- Summary of changes: librtmp/parseurl.c | 8 ++++++-- librtmp/rtmp.c | 38 ++++++++------------------------------ 2 files changed, 14 insertions(+), 32 deletions(-) hooks/post-receive --

1 0

[PATCH] Get rid of declarations after statements in limelight authentication
by Martin Storsjo 30 Oct '12

30 Oct '12

--- librtmp/rtmp.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 3994d42..fbfbc50 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -2695,6 +2695,12 @@ PublisherAuth(RTMP *r, AVal *description) char *user = NULL; char *nonce = NULL; + const char *authmod, *realm, *method, *qop; + char *tmpbuf, *hash1, *hash2, *hash3, *apptmp, *qpos; + int nc; + char nchex[9]; + char cnonce[9]; + ptr = orig_ptr = strdup(token_in); /* Extract parameters (we need user and nonce) */ while (ptr) @@ -2725,19 +2731,16 @@ PublisherAuth(RTMP *r, AVal *description) * http://en.wikipedia.org/wiki/Digest_access_authentication */ - const char *authmod = "llnw"; - const char *realm = "live"; - const char *method = "publish"; - const char *qop = "auth"; - char *tmpbuf; + authmod = "llnw"; + realm = "live"; + method = "publish"; + qop = "auth"; /* nc = 1..connection count (or rather, number of times cnonce has been reused) */ - int nc = 1; + nc = 1; /* nchex = hexenc(nc) (8 hex digits according to RFC 2617) */ - char nchex[9]; sprintf(nchex, "%08x", nc); /* cnonce = hexenc(4 random bytes) (initialized on first connection) */ - char cnonce[9]; srand( time(NULL) ); // FIXME: a lib shouldn't call srand() sprintf(cnonce, "%08x", rand()); @@ -2748,11 +2751,11 @@ PublisherAuth(RTMP *r, AVal *description) RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s) =>", __FUNCTION__, tmpbuf); RTMP_LogHexString(RTMP_LOGDEBUG, md5sum_val, MD5_DIGEST_LENGTH); free(tmpbuf); - char *hash1 = hexenc(md5sum_val, MD5_DIGEST_LENGTH); + hash1 = hexenc(md5sum_val, MD5_DIGEST_LENGTH); /* hash2 = hexenc(md5(method + ":/" + app + "/" + appInstance)) */ /* Extract appname + appinstance without query parameters */ - char *apptmp = malloc(r->Link.app.av_len + 1), *qpos; + apptmp = malloc(r->Link.app.av_len + 1); memcpy(apptmp, r->Link.app.av_val, r->Link.app.av_len); apptmp[r->Link.app.av_len] = '\0'; if((qpos = strchr(apptmp, '?'))) @@ -2764,7 +2767,7 @@ PublisherAuth(RTMP *r, AVal *description) RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s) =>", __FUNCTION__, tmpbuf); RTMP_LogHexString(RTMP_LOGDEBUG, md5sum_val, MD5_DIGEST_LENGTH); free(tmpbuf); - char *hash2 = hexenc(md5sum_val, MD5_DIGEST_LENGTH); + hash2 = hexenc(md5sum_val, MD5_DIGEST_LENGTH); free(apptmp); @@ -2775,7 +2778,7 @@ PublisherAuth(RTMP *r, AVal *description) RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s) =>", __FUNCTION__, tmpbuf); RTMP_LogHexString(RTMP_LOGDEBUG, md5sum_val, MD5_DIGEST_LENGTH); free(tmpbuf); - char *hash3 = hexenc(md5sum_val, MD5_DIGEST_LENGTH); + hash3 = hexenc(md5sum_val, MD5_DIGEST_LENGTH); /* pubToken = &authmod=<authmod>&user=<username>&nonce=<nonce>&cnonce=<cnonce>&nc=<nchex>&response=<hash3> */ /* Append nonces and response to query string which already contains -- 1.7.9.4

2 1

[PATCH] Remove semicolons from function-like macros
by Martin Storsjo 30 Oct '12

30 Oct '12

--- librtmp/rtmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 5ea1c76..a70e084 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -2497,7 +2497,7 @@ b64enc(const unsigned char *input, int length, char *output, int maxsize) } #ifdef USE_POLARSSL -#define md5sum(x,y,z) md5(x,y,z); +#define md5sum(x,y,z) md5(x,y,z) #elif defined(USE_GNUTLS) static void md5sum(const unsigned char *data, int len, unsigned char *out) { @@ -2507,7 +2507,7 @@ static void md5sum(const unsigned char *data, int len, unsigned char *out) md5_digest(&ctx, MD5_DIGEST_LENGTH, out); } #else -#define md5sum(x,y,z) MD5(x,y,z); +#define md5sum(x,y,z) MD5(x,y,z) #endif static const AVal av_authmod_adobe = AVC("authmod=adobe"); -- 1.7.9.4

2 1

branch master updated. e42b5d0 Cleanup authentication code
by gil＠avcodec.org 30 Oct '12

30 Oct '12

The branch, master has been updated via e42b5d0926b1a668d7fbd794a70f31040c5f198d (commit) from 883c33489403ed360a01d1a47ec76d476525b49e (commit) - Log ----------------------------------------------------------------- commit e42b5d0926b1a668d7fbd794a70f31040c5f198d Author: Howard Chu <hyc(a)highlandsun.com> AuthorDate: Tue Oct 30 11:17:41 2012 -0700 Commit: Howard Chu <hyc(a)highlandsun.com> CommitDate: Tue Oct 30 11:17:41 2012 -0700 Cleanup authentication code from commit 9ecf540e4d5bdc85c17668fa7ead93cc375111ca diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 5ea1c76..6d04708 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -2497,17 +2497,16 @@ b64enc(const unsigned char *input, int length, char *output, int maxsize) } #ifdef USE_POLARSSL -#define md5sum(x,y,z) md5(x,y,z); +#define MD5_CTX md5_context +#define MD5_Init(ctx) md5_starts(ctx) +#define MD5_Update(ctx,data,len) md5_update(ctx,data,len) +#define MD5_Final(dig,ctx) md5_finish(ctx,dig) #elif defined(USE_GNUTLS) -static void md5sum(const unsigned char *data, int len, unsigned char *out) -{ - struct md5_ctx ctx; - md5_init(&ctx); - md5_update(&ctx, len, data); - md5_digest(&ctx, MD5_DIGEST_LENGTH, out); -} +typedef struct md5_ctx MD5_CTX +#define MD5_Init(ctx) md5_init(ctx) +#define MD5_Update(ctx,data,len) md5_update(ctx,len,data) +#define MD5_Final(dig,ctx) md5_digest(ctx,MD5_DIGEST_LENGTH,dig) #else -#define md5sum(x,y,z) MD5(x,y,z); #endif static const AVal av_authmod_adobe = AVC("authmod=adobe"); @@ -2530,10 +2529,14 @@ PublisherAuth(RTMP *r, AVal *description) char *token_in = NULL; char *ptr; unsigned char md5sum_val[MD5_DIGEST_LENGTH+1]; + MD5_CTX md5ctx; int challenge2_data; #define RESPONSE_LEN 32 #define CHALLENGE2_LEN 16 #define SALTED2_LEN (32+8+8+8) +#define B64DIGEST_LEN 22 /* 16 byte digest => 22 b64 chars */ +#define B64INT_LEN 6 /* 4 byte int => 6 b64 chars */ +#define HEXHASH_LEN (2*MD5_DIGEST_LENGTH) char response[RESPONSE_LEN]; char challenge2[CHALLENGE2_LEN]; char salted2[SALTED2_LEN]; @@ -2563,11 +2566,9 @@ PublisherAuth(RTMP *r, AVal *description) else if((token_in = strstr(description->av_val, "?reason=needauth")) != NULL) { char *par, *val = NULL, *orig_ptr; - char *user = NULL; - char *salt = NULL; - char *opaque = NULL; - char *challenge = NULL; - char *salted1; + AVal user, salt, opaque, challenge, *aptr = NULL; + opaque.av_len = 0; + challenge.av_len = 0; ptr = orig_ptr = strdup(token_in); while (ptr) @@ -2581,60 +2582,72 @@ PublisherAuth(RTMP *r, AVal *description) if(val) *val++ = '\0'; + if (aptr) { + aptr->av_len = par - aptr->av_val - 1; + aptr = NULL; + } if (strcmp(par, "user") == 0){ - user = val; + user.av_val = val; + aptr = &user; } else if (strcmp(par, "salt") == 0){ - salt = val; + salt.av_val = val; + aptr = &salt; } else if (strcmp(par, "opaque") == 0){ - opaque = val; + opaque.av_val = val; + aptr = &opaque; } else if (strcmp(par, "challenge") == 0){ - challenge = val; + challenge.av_val = val; + aptr = &challenge; } RTMP_Log(RTMP_LOGDEBUG, "%s, par:\"%s\" = val:\"%s\"", __FUNCTION__, par, val); } + if (aptr) + aptr->av_len = strlen(aptr->av_val); + + /* hash1 = base64enc(md5(user + _aodbeAuthSalt + password)) */ + MD5_Init(&md5ctx); + MD5_Update(&md5ctx, user.av_val, user.av_len); + MD5_Update(&md5ctx, salt.av_val, salt.av_len); + MD5_Update(&md5ctx, r->Link.pubPasswd.av_val, r->Link.pubPasswd.av_len); + MD5_Final(md5sum_val, &md5ctx); + RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s%s%s) =>", __FUNCTION__, + user.av_val, salt.av_val, r->Link.pubPasswd.av_val); + RTMP_LogHexString(RTMP_LOGDEBUG, md5sum_val, MD5_DIGEST_LENGTH); - /* hash1 = base64enc(md5(user + _aodbeAuthSalt + password)) */ - salted1 = malloc(strlen(user)+strlen(salt)+r->Link.pubPasswd.av_len+1); - strcpy(salted1, user); - strcat(salted1, salt); - strcat(salted1, r->Link.pubPasswd.av_val); - md5sum((unsigned char*) salted1, strlen(salted1), md5sum_val); - RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s) =>", __FUNCTION__, salted1); - free(salted1); - - RTMP_LogHexString(RTMP_LOGDEBUG, md5sum_val, MD5_DIGEST_LENGTH); - - b64enc(md5sum_val, MD5_DIGEST_LENGTH, salted2, SALTED2_LEN); - RTMP_Log(RTMP_LOGDEBUG, "%s, b64(md5_1) = %s", __FUNCTION__, salted2); + b64enc(md5sum_val, MD5_DIGEST_LENGTH, salted2, SALTED2_LEN); + RTMP_Log(RTMP_LOGDEBUG, "%s, b64(md5_1) = %s", __FUNCTION__, salted2); - srand( time(NULL) ); + /* FIXME: what byte order does this depend on? */ challenge2_data = rand(); b64enc((unsigned char *) &challenge2_data, sizeof(int), challenge2, CHALLENGE2_LEN); RTMP_Log(RTMP_LOGDEBUG, "%s, b64(%d) = %s", __FUNCTION__, challenge2_data, challenge2); + MD5_Init(&md5ctx); + MD5_Update(&md5ctx, salted2, B64DIGEST_LEN); /* response = base64enc(md5(hash1 + opaque + challenge2)) */ - if (opaque) - strcat(salted2, opaque); - if (challenge) - strcat(salted2, challenge); - strcat(salted2, challenge2); - - md5sum((unsigned char*) salted2, strlen(salted2), md5sum_val); - RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s) =>", __FUNCTION__, salted2); - RTMP_LogHexString(RTMP_LOGDEBUG, md5sum_val, MD5_DIGEST_LENGTH); + if (opaque.av_len) + MD5_Update(&md5ctx, opaque.av_val, opaque.av_len); + if (challenge.av_len) + MD5_Update(&md5ctx, challenge.av_val, challenge.av_len); + MD5_Update(&md5ctx, challenge2, B64INT_LEN); + MD5_Final(md5sum_val, &md5ctx); + + RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s%s%s) =>", __FUNCTION__, + salted2, opaque.av_len ? opaque.av_val : "", challenge2); + RTMP_LogHexString(RTMP_LOGDEBUG, md5sum_val, MD5_DIGEST_LENGTH); - b64enc(md5sum_val, MD5_DIGEST_LENGTH, response, RESPONSE_LEN); - RTMP_Log(RTMP_LOGDEBUG, "%s, b64(md5_2) = %s", __FUNCTION__, response); + b64enc(md5sum_val, MD5_DIGEST_LENGTH, response, RESPONSE_LEN); + RTMP_Log(RTMP_LOGDEBUG, "%s, b64(md5_2) = %s", __FUNCTION__, response); /* have all hashes, create auth token for the end of app */ - pubToken.av_val = malloc(32 + strlen(challenge2) + strlen(response) + (opaque ? strlen(opaque) : 0)); + pubToken.av_val = malloc(32 + B64INT_LEN + B64DIGEST_LEN + opaque.av_len); pubToken.av_len = sprintf(pubToken.av_val, "&challenge=%s&response=%s&opaque=%s", challenge2, response, - opaque ? opaque : ""); + opaque.av_len ? opaque.av_val : ""); RTMP_Log(RTMP_LOGDEBUG, "%s, pubToken2: %s", __FUNCTION__, pubToken.av_val); free(orig_ptr); r->Link.pFlags |= RTMP_PUB_RESP|RTMP_PUB_CLATE; @@ -2710,8 +2723,26 @@ PublisherAuth(RTMP *r, AVal *description) { char *orig_ptr; char *par, *val = NULL; - char *user = NULL; - char *nonce = NULL; + char *hash1, *hash2, *hash3; + AVal user, nonce, *aptr = NULL; + AVal apptmp; + + /* llnw auth method + * Seems to be closely based on HTTP Digest Auth: + * http://tools.ietf.org/html/rfc2617 + * http://en.wikipedia.org/wiki/Digest_access_authentication + */ + + const char authmod[] = "llnw"; + const char realm[] = "live"; + const char method[] = "publish"; + const char qop[] = "auth"; + /* nc = 1..connection count (or rather, number of times cnonce has been reused) */ + int nc = 1; + /* nchex = hexenc(nc) (8 hex digits according to RFC 2617) */ + char nchex[9]; + /* cnonce = hexenc(4 random bytes) (initialized on first connection) */ + char cnonce[9]; ptr = orig_ptr = strdup(token_in); /* Extract parameters (we need user and nonce) */ @@ -2726,82 +2757,84 @@ PublisherAuth(RTMP *r, AVal *description) if(val) *val++ = '\0'; + if (aptr) { + aptr->av_len = par - aptr->av_val - 1; + aptr = NULL; + } if (strcmp(par, "user") == 0){ - user = val; + user.av_val = val; + aptr = &user; } else if (strcmp(par, "nonce") == 0){ - nonce = val; + nonce.av_val = val; + aptr = &nonce; } RTMP_Log(RTMP_LOGDEBUG, "%s, par:\"%s\" = val:\"%s\"", __FUNCTION__, par, val); } + if (aptr) + aptr->av_len = strlen(aptr->av_val); - // FIXME: handle case where user==NULL or nonce==NULL - - /* llnw auth method - * Seems to be closely based on HTTP Digest Auth: - * http://tools.ietf.org/html/rfc2617 - * http://en.wikipedia.org/wiki/Digest_access_authentication - */ - - const char *authmod = "llnw"; - const char *realm = "live"; - const char *method = "publish"; - const char *qop = "auth"; - char *tmpbuf; + /* FIXME: handle case where user==NULL or nonce==NULL */ - /* nc = 1..connection count (or rather, number of times cnonce has been reused) */ - int nc = 1; - /* nchex = hexenc(nc) (8 hex digits according to RFC 2617) */ - char nchex[9]; sprintf(nchex, "%08x", nc); - /* cnonce = hexenc(4 random bytes) (initialized on first connection) */ - char cnonce[9]; - srand( time(NULL) ); // FIXME: a lib shouldn't call srand() sprintf(cnonce, "%08x", rand()); /* hash1 = hexenc(md5(user + ":" + realm + ":" + password)) */ - tmpbuf = malloc(strlen(user) + 1 + strlen(realm) + 1 + r->Link.pubPasswd.av_len + 1); - sprintf(tmpbuf, "%s:%s:%s", user, realm, r->Link.pubPasswd.av_val); - md5sum((unsigned char*)tmpbuf, strlen(tmpbuf), md5sum_val); - RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s) =>", __FUNCTION__, tmpbuf); + MD5_Init(&md5ctx); + MD5_Update(&md5ctx, user.av_val, user.av_len); + MD5_Update(&md5ctx, ":", 1); + MD5_Update(&md5ctx, realm, sizeof(realm)-1); + MD5_Update(&md5ctx, ":", 1); + MD5_Update(&md5ctx, r->Link.pubPasswd.av_val, r->Link.pubPasswd.av_len); + MD5_Final(md5sum_val, &md5ctx); + RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s:%s:%s) =>", __FUNCTION__, + user.av_val, realm, r->Link.pubPasswd.av_val); RTMP_LogHexString(RTMP_LOGDEBUG, md5sum_val, MD5_DIGEST_LENGTH); - free(tmpbuf); - char *hash1 = hexenc(md5sum_val, MD5_DIGEST_LENGTH); + hash1 = hexenc(md5sum_val, MD5_DIGEST_LENGTH); /* hash2 = hexenc(md5(method + ":/" + app + "/" + appInstance)) */ /* Extract appname + appinstance without query parameters */ - char *apptmp = malloc(r->Link.app.av_len + 1), *qpos; - memcpy(apptmp, r->Link.app.av_val, r->Link.app.av_len); - apptmp[r->Link.app.av_len] = '\0'; - if((qpos = strchr(apptmp, '?'))) - *qpos = '\0'; - - tmpbuf = malloc(strlen(method) + 2 + strlen(apptmp) + 1); - sprintf(tmpbuf, "%s:/%s", method, apptmp); - md5sum((unsigned char*)tmpbuf, strlen(tmpbuf), md5sum_val); - RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s) =>", __FUNCTION__, tmpbuf); + apptmp = r->Link.app; + ptr = strchr(apptmp.av_val, '?'); + if (ptr) + apptmp.av_len = ptr - apptmp.av_val; + + MD5_Init(&md5ctx); + MD5_Update(&md5ctx, method, sizeof(method)-1); + MD5_Update(&md5ctx, ":/", 2); + MD5_Update(&md5ctx, apptmp.av_val, apptmp.av_len); + MD5_Final(md5sum_val, &md5ctx); + RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s:/%.*s) =>", __FUNCTION__, + method, apptmp.av_len, apptmp.av_val); RTMP_LogHexString(RTMP_LOGDEBUG, md5sum_val, MD5_DIGEST_LENGTH); - free(tmpbuf); - char *hash2 = hexenc(md5sum_val, MD5_DIGEST_LENGTH); - - free(apptmp); + hash2 = hexenc(md5sum_val, MD5_DIGEST_LENGTH); /* hash3 = hexenc(md5(hash1 + ":" + nonce + ":" + nchex + ":" + cnonce + ":" + qop + ":" + hash2)) */ - tmpbuf = malloc(strlen(hash1) + 1 + strlen(nonce) + 1 + strlen(nchex) + 1 + strlen(cnonce) + 1 + strlen(qop) + 1 + strlen(hash2) + 1); - sprintf(tmpbuf, "%s:%s:%s:%s:%s:%s", hash1, nonce, nchex, cnonce, qop, hash2); - md5sum((unsigned char*)tmpbuf, strlen(tmpbuf), md5sum_val); - RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s) =>", __FUNCTION__, tmpbuf); + MD5_Init(&md5ctx); + MD5_Update(&md5ctx, hash1, HEXHASH_LEN); + MD5_Update(&md5ctx, ":", 1); + MD5_Update(&md5ctx, nonce.av_val, nonce.av_len); + MD5_Update(&md5ctx, ":", 1); + MD5_Update(&md5ctx, nchex, sizeof(nchex)-1); + MD5_Update(&md5ctx, ":", 1); + MD5_Update(&md5ctx, cnonce, sizeof(cnonce)-1); + MD5_Update(&md5ctx, ":", 1); + MD5_Update(&md5ctx, qop, sizeof(qop)-1); + MD5_Update(&md5ctx, ":", 1); + MD5_Update(&md5ctx, hash2, HEXHASH_LEN); + MD5_Final(md5sum_val, &md5ctx); + RTMP_Log(RTMP_LOGDEBUG, "%s, md5(%s:%s:%s:%s:%s:%s) =>", __FUNCTION__, + hash1, nonce.av_val, nchex, cnonce, qop, hash2); RTMP_LogHexString(RTMP_LOGDEBUG, md5sum_val, MD5_DIGEST_LENGTH); - free(tmpbuf); - char *hash3 = hexenc(md5sum_val, MD5_DIGEST_LENGTH); + hash3 = hexenc(md5sum_val, MD5_DIGEST_LENGTH); /* pubToken = &authmod=<authmod>&user=<username>&nonce=<nonce>&cnonce=<cnonce>&nc=<nchex>&response=<hash3> */ /* Append nonces and response to query string which already contains * user + authmod */ - pubToken.av_val = malloc(64 + strlen(authmod) + strlen(user) + strlen(nonce) + strlen(cnonce) + strlen(nchex) + strlen(hash3)); + pubToken.av_val = malloc(64 + sizeof(authmod)-1 + user.av_len + nonce.av_len + sizeof(cnonce)-1 + sizeof(nchex)-1 + HEXHASH_LEN); sprintf(pubToken.av_val, "&nonce=%s&cnonce=%s&nc=%s&response=%s", - nonce, cnonce, nchex, hash3); + nonce.av_val, cnonce, nchex, hash3); pubToken.av_len = strlen(pubToken.av_val); RTMP_Log(RTMP_LOGDEBUG, "%s, pubToken2: %s", __FUNCTION__, pubToken.av_val); r->Link.pFlags |= RTMP_PUB_RESP|RTMP_PUB_CLATE; ----------------------------------------------------------------------- Summary of changes: librtmp/rtmp.c | 227 ++++++++++++++++++++++++++++++++------------------------ 1 files changed, 130 insertions(+), 97 deletions(-) hooks/post-receive --

1 0

[PATCH] Simplify initializing the TLS server context
by Martin Storsjo 30 Oct '12

30 Oct '12

This does the same thing, but I wasn't aware of these functions when I initially wrote this. --- librtmp/rtmp.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 5ea1c76..3994d42 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -280,32 +280,14 @@ RTMP_TLS_AllocServerContext(const char* cert, const char* key) } #elif !defined(NO_SSL) /* USE_OPENSSL */ ctx = SSL_CTX_new(SSLv23_server_method()); - FILE *f = fopen(key, "r"); - if (!f) { + if (!SSL_CTX_use_certificate_chain_file(ctx, cert)) { SSL_CTX_free(ctx); return NULL; } - EVP_PKEY *k = PEM_read_PrivateKey(f, NULL, NULL, NULL); - fclose(f); - if (!k) { + if (!SSL_CTX_use_PrivateKey_file(ctx, key, SSL_FILETYPE_PEM)) { SSL_CTX_free(ctx); return NULL; } - SSL_CTX_use_PrivateKey(ctx, k); - EVP_PKEY_free(k); - f = fopen(cert, "r"); - if (!f) { - SSL_CTX_free(ctx); - return NULL; - } - X509 *c = PEM_read_X509(f, NULL, NULL, NULL); - fclose(f); - if (!c) { - SSL_CTX_free(ctx); - return NULL; - } - SSL_CTX_use_certificate(ctx, c); - X509_free(c); #endif #endif return ctx; -- 1.7.9.4

1 0