[FFmpeg-cvslog] avformat/rtmpproto: use AVHMAC instead of a custom implementation
James Almer
git at videolan.org
Wed Jul 29 20:33:01 CEST 2015
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Jul 28 23:56:42 2015 -0300| [6c87b866285fae0a45ab4d7162088428f60bd332] | committer: James Almer
avformat/rtmpproto: use AVHMAC instead of a custom implementation
Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c87b866285fae0a45ab4d7162088428f60bd332
---
libavformat/rtmp.h | 3 ---
libavformat/rtmpproto.c | 39 ++++++++++-----------------------------
2 files changed, 10 insertions(+), 32 deletions(-)
diff --git a/libavformat/rtmp.h b/libavformat/rtmp.h
index 8fc8040..6600da7 100644
--- a/libavformat/rtmp.h
+++ b/libavformat/rtmp.h
@@ -29,9 +29,6 @@
#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
* @{
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 0abeadc..d6c772c 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -27,12 +27,12 @@
#include "libavcodec/bytestream.h"
#include "libavutil/avstring.h"
#include "libavutil/base64.h"
+#include "libavutil/hmac.h"
#include "libavutil/intfloat.h"
#include "libavutil/lfg.h"
#include "libavutil/md5.h"
#include "libavutil/opt.h"
#include "libavutil/random_seed.h"
-#include "libavutil/sha.h"
#include "avformat.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,
const uint8_t *key, int keylen, uint8_t *dst)
{
- struct AVSHA *sha;
- uint8_t hmac_buf[64+32] = {0};
- int i;
+ AVHMAC *hmac;
- sha = av_sha_alloc();
- if (!sha)
+ hmac = av_hmac_alloc(AV_HMAC_SHA256);
+ if (!hmac)
return AVERROR(ENOMEM);
- if (keylen < 64) {
- 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);
+ av_hmac_init(hmac, key, keylen);
if (gap <= 0) {
- av_sha_update(sha, src, len);
+ av_hmac_update(hmac, src, len);
} else { //skip 32 bytes used for storing digest
- av_sha_update(sha, src, gap);
- av_sha_update(sha, src + gap + 32, len - gap - 32);
+ av_hmac_update(hmac, src, gap);
+ av_hmac_update(hmac, src + gap + 32, len - gap - 32);
}
- av_sha_final(sha, hmac_buf + 64);
-
- for (i = 0; i < 64; i++)
- 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_hmac_final(hmac, dst, 32);
- av_free(sha);
+ av_free(hmac);
return 0;
}
More information about the ffmpeg-cvslog
mailing list