From: hyc Date: Wed, 14 Apr 2010 19:38:11 +0000 (+0000) Subject: v2.2c stuff. not much user-visible X-Git-Tag: v2.4~115 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=010d5bdc8133b314a5d20d8b2320c04200379eb8;p=rtmpdump v2.2c stuff. not much user-visible git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@430 400ebc74-4327-4243-bc38-086b20814532 --- diff --git a/ChangeLog b/ChangeLog index 9f49697..84269a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ Copyright 2009-2010 Howard Chu Copyright 2009 The Flvstreamer Team http://rtmpdump.mplayerhq.hu/ +14 April 2010, v2.2c +- internal restructuring, fix #undef CRYPTO builds +- add RTMP_SetupURL, RTMP_SetOpt APIs +- add logging callback + 22 March 2010, v2.2b - fix v2.2a crashes in rtmpsrv/rtmpsuck - fix v2.2a .swfinfo location on Windows diff --git a/Makefile b/Makefile index 637fc44..907b566 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=v2.2b +VERSION=v2.2c CC=$(CROSS_COMPILE)gcc LD=$(CROSS_COMPILE)ld diff --git a/README b/README index a98259b..194eeb7 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -RTMP Dump v2.2b +RTMP Dump v2.2c (C) 2009 Andrej Stepanchuk (C) 2009-2010 Howard Chu (C) 2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090 diff --git a/librtmp/Makefile b/librtmp/Makefile index 776b340..c1ca973 100644 --- a/librtmp/Makefile +++ b/librtmp/Makefile @@ -1,4 +1,4 @@ -VERSION=v2.2b +VERSION=v2.2c prefix=/usr/local diff --git a/librtmp/handshake.h b/librtmp/handshake.h index b0e8806..f91f689 100644 --- a/librtmp/handshake.h +++ b/librtmp/handshake.h @@ -43,9 +43,9 @@ typedef gcry_cipher_hd_t RC4_handle; #include #include #include -#define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, (uint8_t *)key, len, EVP_sha256(), 0) -#define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, (uint8_t *)buf, len) -#define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, (uint8_t *)dig, &dlen); HMAC_CTX_cleanup(&ctx) +#define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, key, len, EVP_sha256(), 0) +#define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, buf, len) +#define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, dig, &dlen); HMAC_CTX_cleanup(&ctx) typedef RC4_KEY * RC4_handle; #define RC4_setup(h) *h = malloc(sizeof(RC4_KEY)) diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h index 7376af2..d75c48f 100644 --- a/librtmp/rtmp.h +++ b/librtmp/rtmp.h @@ -39,7 +39,7 @@ extern "C" { #endif -#define RTMP_LIB_VERSION 0x020202 /* 2.2b */ +#define RTMP_LIB_VERSION 0x020203 /* 2.2c */ #define RTMP_FEATURE_HTTP 0x01 #define RTMP_FEATURE_ENC 0x02