From patchwork Fri Mar 3 04:54:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 2740 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.31.14 with SMTP id f14csp90130vsf; Thu, 2 Mar 2017 20:55:54 -0800 (PST) X-Received: by 10.28.182.7 with SMTP id g7mr932341wmf.108.1488516953920; Thu, 02 Mar 2017 20:55:53 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p108si13267501wrc.128.2017.03.02.20.55.53; Thu, 02 Mar 2017 20:55:53 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 24EE7688283; Fri, 3 Mar 2017 06:55:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C53696805FB for ; Fri, 3 Mar 2017 06:55:23 +0200 (EET) Received: by mail-qk0-f195.google.com with SMTP id j127so6414883qke.0 for ; Thu, 02 Mar 2017 20:55:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=/gWV32YfKvlEP0fir4J/8MjybYxDe0xsZts6uCX9PCo=; b=KQcwohk5IQROT+nq0PyrKp9Ils5ZejxNEHf2bOgJ+517KgpN/Dvn5Gf64P5sSL1fyt rM+BK5B1q0izN+TMiQvA6S4UNFKD027zgnjdygUBASgpqAk4bv8xyrAtWYIm/v7ODFy7 iYxdr7qBFZ56EZ/mqnjNjxgbG5mVzHA+MbA4YBwVnbQLQhIAOt7NBhoC+xq9AdGuG2e6 yu72mKNGRspi8zgXfPUFyBm+l+LmcVGBe01UkSoKVc6fdQuvy/PrSchlBwZvRZXV6NIU JiZxQl6rR00GHO/QCYEc5wOWAbYe34NoJTjjZ8YgLJP3zLdLDsbPpKIewn7HWRJg1NjV ej6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=/gWV32YfKvlEP0fir4J/8MjybYxDe0xsZts6uCX9PCo=; b=OvqpHOKT+XzjkISpFOshWBQ8NZV1cTeo/xM5SP0RKkk2qWl4N5WmuZefY2Qn1ZhB+3 Z8KkJCBR3K4v4WbkfOr+puHnR4kQA+pHb4o9tFOQyGsrxMN7g3UIUoCDfz1ZyPtjJZl2 Gb35p+Mpr/GSTWUWlFe/fa5bF6zI8umxZsiVljvf+oU74tEE9mN2BCPWvZ7fsI8yL0x+ jCBT9tOu1+fX+vFR6a/CqH3AeE4H8mURbA1prdPsBDWaPCmJXQ0ld8SJhBDX97YWr303 KiZ9popyKrGASXolvKhcrziDRBWoFJPLdACkUsO8q7UCN/8qnSSmOJeg2dixdkoD82hq zATA== X-Gm-Message-State: AMke39koY/a265VwIxGwYrP7B3/8XwtvlfdD57fVv8By73vTbLF81H80yjF4Hu9NdDnt2Q== X-Received: by 10.237.37.229 with SMTP id y34mr834210qtc.30.1488516934025; Thu, 02 Mar 2017 20:55:34 -0800 (PST) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id g13sm6959495qtg.8.2017.03.02.20.55.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Mar 2017 20:55:33 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Mar 2017 01:54:20 -0300 Message-Id: <20170303045420.5036-2-jamrial@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170303045420.5036-1-jamrial@gmail.com> References: <20170303045420.5036-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avutil/md5: stop discarding the const qualifier for the src pointer 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The code modifying the buffer on big endian systems was removed. Signed-off-by: James Almer --- libavutil/md5.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavutil/md5.c b/libavutil/md5.c index d3698dcb1d..1069ef1efe 100644 --- a/libavutil/md5.c +++ b/libavutil/md5.c @@ -98,11 +98,12 @@ static const uint32_t T[64] = { // T[i]= fabs(sin(i+1)<<32) a = b + (a << t | a >> (32 - t)); \ } while (0) -static void body(uint32_t ABCD[4], uint32_t *src, int nblocks) +static void body(uint32_t ABCD[4], const uint8_t *src, int nblocks) { int i av_unused; int n; - uint32_t a, b, c, d, t, *X; + const uint32_t *X; + uint32_t a, b, c, d, t; for (n = 0; n < nblocks; n++) { a = ABCD[3]; @@ -110,7 +111,7 @@ static void body(uint32_t ABCD[4], uint32_t *src, int nblocks) c = ABCD[1]; d = ABCD[0]; - X = src + n * 16; + X = (const uint32_t *)src + n * 16; #if CONFIG_SMALL for (i = 0; i < 64; i++) { @@ -164,19 +165,19 @@ void av_md5_update(AVMD5 *ctx, const uint8_t *src, int len) len -= cnt; if (j + cnt < 64) return; - body(ctx->ABCD, (uint32_t *)ctx->block, 1); + body(ctx->ABCD, ctx->block, 1); } end = src + (len & ~63); if (!HAVE_FAST_UNALIGNED && ((intptr_t)src & 3)) { while (src < end) { memcpy(ctx->block, src, 64); - body(ctx->ABCD, (uint32_t *) ctx->block, 1); + body(ctx->ABCD, ctx->block, 1); src += 64; } } else { int nblocks = len / 64; - body(ctx->ABCD, (uint32_t *)src, nblocks); + body(ctx->ABCD, src, nblocks); src = end; } len &= 63;