From patchwork Fri Jun 1 02:56:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 9220 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp351981jad; Thu, 31 May 2018 19:57:38 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIRIPzos9ChXiLwKn3/bmK2tZohyrBp+1JPEXQ1vjAFtbFj6JUw6BxGv3zkFqjYLxOoTEsm X-Received: by 2002:adf:99f4:: with SMTP id y107-v6mr6611390wrb.277.1527821858788; Thu, 31 May 2018 19:57:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527821858; cv=none; d=google.com; s=arc-20160816; b=e+YWXcwrONkJwshVYxiHJKHq1pWbmDVwti3IO4QNDedDfEwPSWzqgG/J+EyYnu3PrX ypQRGB4ll8Q4umm9ZKI+hzda81jIpJAjscOap86EnSMnZ5Lud6cNIxKVIwxhskuF2/IV Qe22y842vswpIQ5auhiCbiJZQpdAg7djLdNa8UhtqjZUImAe/1QjfuAOlF6my/q6s0y5 IwoDsVIGB4I2GtxSsrb8w3C9wSAXWDyhpDQ7duKuZVG7xQZpXmT23zqoC2gRn+c5+uU3 wNtf8jwk87Z52XWYeBuFwkWXMZMOluM8h2+9SchA2VHKBbaPSOkx4hdqcFfJLAapa5Fn 7SSw== 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=o2x49WUieFqbh8lynxisfrNZMtWgn8UJlgWqqMsU2r4=; b=rzmQ5KSmisra1EPRqz0ixY9bb2MCYcnMsnmD8re6CfP2aXtbEPL9lgh6nGl1vtGV65 +W+B42ok0njdqZX+mDpc9CK1yBT4tA3FuZakYHeiTY9UnwKF+WB725AovlgMF1/GP+LO V6R6lNUdfdnFLW8/ififuKtGPtQ90IyYFSOhS29Kq+UngSMACjJIQogXAqCSHqtj0AFB gCFEfvGWyLrlwS3Ev2MjJmcpI4TKtynwbHB+n8PHlHbnEsUwrKVpdsHNmkwHAr5T6VI7 5/9V2qRKFxh32yCPHu3NX5DLNv7/eU/SwV4yS79z9SageFADoMsjQ2Nxi4kLB3BAaVhO 0NCQ== 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 g5-v6si4485165wro.273.2018.05.31.19.57.37; Thu, 31 May 2018 19:57:38 -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 861D468A48A; Fri, 1 Jun 2018 05:56:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgsg2.qq.com (smtpbgsg2.qq.com [54.254.200.128]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EAF368A331 for ; Fri, 1 Jun 2018 05:56:42 +0300 (EEST) X-QQ-mid: bizesmtp2t1527821839tgz1jcnis Received: from localhost (unknown [123.115.193.127]) by esmtp4.qq.com (ESMTP) with id ; Fri, 01 Jun 2018 10:57:19 +0800 (CST) X-QQ-SSF: 01100000002000F0FLF0B00A0000000 X-QQ-FEAT: R/yWRekfFcrEDfq111Hf197zo65dWsbVvMdn+3ln+p2Tp7rVKYCZ9oAoDAVvq KdZJt6fAXUKmDVjrm67S1dPDORZVAgQN2dndqafU3blvjQTTBzYoz1MIreSa1g3v8MemkI0 1ZhLRL+rU/ceeBd5KWmNDaxr6U0PIOc43sPV3Ffpr5+lsw8YvyS0W18OoJ2YZ145ELINetA MBfn/3D+klLkRrs8srtIwNTUcD+7b8OE/ObRaauYAg+MWsfeeldIxfuExKgHf/6k6mdbEdY 57JXqZbd1wVP4t+03p31i92OvNuXXr+EYwsA== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jun 2018 10:56:56 +0800 Message-Id: <20180601025656.76187-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.15.1 (Apple Git-101) In-Reply-To: <2bea34d9-c61e-a805-8ed3-d7e11016accf@gmail.com> References: <2bea34d9-c61e-a805-8ed3-d7e11016accf@gmail.com> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v2] 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" --- configure | 1 - libavformat/hlsenc.c | 31 ++++++++++--------------------- 2 files changed, 10 insertions(+), 22 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..3012b2a727 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,16 @@ fail: return ret; } -static int randomize(uint8_t *buf, int len) + +static void randomize(uint8_t *buf, int len) { -#if CONFIG_GCRYPT - gcry_randomize(buf, len, GCRY_VERY_STRONG_RANDOM); - return 0; -#elif CONFIG_OPENSSL - if (RAND_bytes(buf, len)) - return 0; -#else - return AVERROR(ENOSYS); -#endif - return AVERROR(EINVAL); + uint32_t tmp_number[4]; + int i = 0; + + for (i = 0; i < 4; i++) + tmp_number[i] = av_get_random_seed(); + + memcpy(buf, tmp_number, len); } static int do_encrypt(AVFormatContext *s, VariantStream *vs) @@ -633,10 +625,7 @@ static int do_encrypt(AVFormatContext *s, VariantStream *vs) if (!*hls->key_string) { if (!hls->key) { - if ((ret = randomize(key, sizeof(key))) < 0) { - av_log(s, AV_LOG_ERROR, "Cannot generate a strong random key\n"); - return ret; - } + randomize(key, sizeof(key)); } else { memcpy(key, hls->key, sizeof(key)); }