Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

rtmpproto: use AVHMAC instead of a custom implementation

Browse source 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
James Almer 2015-07-29 00:23:43 -03:00 • committed by Martin Storsjö
parent e59f7cd89e
commit 65dd6a1f84
2 changed files with 10 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libavformat/rtmp.h
View file

@ -29,9 +29,6 @@
#define RTMP_HANDSHAKE_PACKET_SIZE 1536 #define RTMP_HANDSHAKE_PACKET_SIZE 1536
#define HMAC_IPAD_VAL 0x36
#define HMAC_OPAD_VAL 0x5C
/** /**
* emulated Flash client version - 9.0.124.2 on Linux * emulated Flash client version - 9.0.124.2 on Linux
* @{ * @{

39
libavformat/rtmpproto.c
View file

@ -27,12 +27,12 @@
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/base64.h" #include "libavutil/base64.h"
#include "libavutil/hmac.h"
#include "libavutil/intfloat.h" #include "libavutil/intfloat.h"
#include "libavutil/lfg.h" #include "libavutil/lfg.h"
#include "libavutil/md5.h" #include "libavutil/md5.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/random_seed.h" #include "libavutil/random_seed.h"
#include "libavutil/sha.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
@ -956,41 +956,22 @@ static int gen_fcsubscribe_stream(URLContext *s, RTMPContext *rt,
int ff_rtmp_calc_digest(const uint8_t *src, int len, int gap, int ff_rtmp_calc_digest(const uint8_t *src, int len, int gap,
const uint8_t *key, int keylen, uint8_t *dst) const uint8_t *key, int keylen, uint8_t *dst)
{ {
struct AVSHA *sha; AVHMAC *hmac;
uint8_t hmac_buf[64+32] = {0};
int i;
sha = av_sha_alloc(); hmac = av_hmac_alloc(AV_HMAC_SHA256);
if (!sha) if (!hmac)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (keylen < 64) { av_hmac_init(hmac, key, keylen);
memcpy(hmac_buf, key, keylen);
} else {
av_sha_init(sha, 256);
av_sha_update(sha,key, keylen);
av_sha_final(sha, hmac_buf);
}
for (i = 0; i < 64; i++)
hmac_buf[i] ^= HMAC_IPAD_VAL;
av_sha_init(sha, 256);
av_sha_update(sha, hmac_buf, 64);
if (gap <= 0) { if (gap <= 0) {
av_sha_update(sha, src, len); av_hmac_update(hmac, src, len);
} else { //skip 32 bytes used for storing digest } else { //skip 32 bytes used for storing digest
av_sha_update(sha, src, gap); av_hmac_update(hmac, src, gap);
av_sha_update(sha, src + gap + 32, len - gap - 32); av_hmac_update(hmac, src + gap + 32, len - gap - 32);
} }
av_sha_final(sha, hmac_buf + 64); av_hmac_final(hmac, dst, 32);
for (i = 0; i < 64; i++) av_free(hmac);
hmac_buf[i] ^= HMAC_IPAD_VAL ^ HMAC_OPAD_VAL; //reuse XORed key for opad
av_sha_init(sha, 256);
av_sha_update(sha, hmac_buf, 64+32);
av_sha_final(sha, dst);
av_free(sha);
return 0; return 0;
} }