From patchwork Mon Jun 4 02:55:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 9242 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp222529jad; Sun, 3 Jun 2018 19:56:48 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKXfGUOCSvacZMWLZ76KnRBZhKEWuTF4RAMWx6cufR5sWco4bjn4M0AC0s+H0wDzXfQeeG6 X-Received: by 2002:a1c:ce:: with SMTP id 197-v6mr7395816wma.118.1528081007948; Sun, 03 Jun 2018 19:56:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528081007; cv=none; d=google.com; s=arc-20160816; b=j8Yntu/dxi/M/mvUbQlBJNSIm6OjZgoAWhfsBob4YlrdLxeE2S0cooM8K+2QrKYHQ5 SPJWkoEQnzAAA2K9ylLe2HKHJuBmsDay/mFKqHQcKycDYH0tXhrCCUwqpSIseaj68OJd luhSyF7R/c4lQZFXs2ohGEeva4EKG5ljOZjdtww3qrOjLa8slSg7ZOlJfz3Ya5R1pooS d9wD64uB0nO84TIMjr+tWhGdSn9pe5uLcI5tPNSEPtlOlzm+H4jv/UQjp15WGv2YfUnw 7RJ6KaShNnBKgDwqny76YNqjsuWFaFFuMrhBKkt93j+zNz+eNptWtVxVa7ESlBMmySRF YQhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=br44JNWlajNw3GPHszy6PKPeXSTxlqsyXP2GFzSu/4g=; b=oSaV0NPx0i+jnvbn8hhDsVusL+6oCnp+9/UEOyT+AYtwqPiDW9LTuQE1PJzsKWdrwv 2UztOeHxJcNQOt8sJs2OqJzyhFtJTvJPpuDFvtmrm/GrPFpISABmHB0N3k0b0xC5/PFh uWRTftIjQEYK/nl3d6g4WpmdeS1yfMqe1u2H2XAcADXZup2bPuDBM9Yd5Vhk61CvUi/y VnDK+MD/VRjCHKpqHxW0AU6gJaGSTDQHm47AnRjAmnx2+4/6GqSDkc9L0OEvqd3CiGea ydZ01jZF8fJz9j3yf0QtY5LDB0AkaQt9ApRcKFVQZA+MTwwXds62aHHFgyBvdOFeRLgT P5VA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h13-v6si509657wmb.124.2018.06.03.19.56.47; Sun, 03 Jun 2018 19:56:47 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D8BD768A521; Mon, 4 Jun 2018 05:55:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg352.qq.com (SMTPBG352.QQ.COM [183.57.50.167]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 083C668A510 for ; Mon, 4 Jun 2018 05:55:51 +0300 (EEST) X-QQ-mid: bizesmtp11t1528080953t8l9oqn8 Received: from localhost (unknown [47.90.47.25]) by esmtp6.qq.com (ESMTP) with id ; Mon, 04 Jun 2018 10:55:52 +0800 (CST) X-QQ-SSF: 011000000020000000K0B00A0000000 X-QQ-FEAT: jLTfbrzLdoMy7gr6yUsitI0HPjO6WTXMNn7eFNANQP9AvPV+AyoHbFQs85mCV mhQZqXnGMgb0KSbRk/uKVqLCqeQMOstG+/Cs7RpqOdQP6kLWqHWs4x0GTTUAoMQMfm+LxBf 2imnuaSpTIMtLl++7zzaXIkWv+NMGhwdxv16cRRWkUtvGkt4HX7mx67tU7lebmzxW6bPAIK 8zexVOOgfhXmoeIIG6ggxyJQ7iBvdEC2UzmDbGDyXw/Fc5vXq+THgevlf3t8oZkjw8p6xCi C4qYN6f0NVFyVlVZjkbPuMQA1O5LhTp4wq+Q== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Jun 2018 10:55:47 +0800 Message-Id: <20180604025547.19018-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty In-Reply-To: <20180601234948.GZ4859@michaelspb> References: <20180601234948.GZ4859@michaelspb> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign1 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v3] avformat/hlsenc: reimplement randomize of hls use av_get_random_seed X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Steven Liu --- configure | 1 - libavformat/hlsenc.c | 27 ++++++++++++--------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 22eeca22a5..a3d0f5837a 100755 --- a/configure +++ b/configure @@ -3127,7 +3127,6 @@ fifo_muxer_deps="threads" flac_demuxer_select="flac_parser" hds_muxer_select="flv_muxer" hls_muxer_select="mpegts_muxer" -hls_muxer_suggest="gcrypt openssl" image2_alias_pix_demuxer_select="image2_demuxer" image2_brender_pix_demuxer_select="image2_demuxer" ipod_muxer_select="mov_muxer" diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 2268f898b0..c04c561586 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -27,12 +27,6 @@ #include #endif -#if CONFIG_GCRYPT -#include -#elif CONFIG_OPENSSL -#include -#endif - #include "libavutil/avassert.h" #include "libavutil/mathematics.h" #include "libavutil/parseutils.h" @@ -569,18 +563,21 @@ fail: return ret; } + static int randomize(uint8_t *buf, int len) { -#if CONFIG_GCRYPT - gcry_randomize(buf, len, GCRY_VERY_STRONG_RANDOM); + uint32_t tmp_number[4]; + int i = 0; + + if (len != 16) + return AVERROR(EINVAL); + + for (i = 0; i < 4; i++) + tmp_number[i] = av_get_random_seed(); + + memcpy(buf, tmp_number, len); + return 0; -#elif CONFIG_OPENSSL - if (RAND_bytes(buf, len)) - return 0; -#else - return AVERROR(ENOSYS); -#endif - return AVERROR(EINVAL); } static int do_encrypt(AVFormatContext *s, VariantStream *vs)