From owner-svn-src-stable-10@freebsd.org Thu Mar 2 09:10:41 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7FAC1CF56E8; Thu, 2 Mar 2017 09:10:41 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2089C27A; Thu, 2 Mar 2017 09:10:41 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v229AeAa097217; Thu, 2 Mar 2017 09:10:40 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v229Aewu097214; Thu, 2 Mar 2017 09:10:40 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201703020910.v229Aewu097214@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 2 Mar 2017 09:10:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r314550 - stable/10/sys/crypto/sha2 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 09:10:41 -0000 Author: avg Date: Thu Mar 2 09:10:39 2017 New Revision: 314550 URL: https://svnweb.freebsd.org/changeset/base/314550 Log: Fix r314332 (MFC of r300903): do not use C99 Static array indices The proper conditional support for that feature has not been MFC-ed yet and GCC is quirky about it. See r314101. This is a direct commit. Reported by: gjb Modified: stable/10/sys/crypto/sha2/sha512c.c stable/10/sys/crypto/sha2/sha512t.h Modified: stable/10/sys/crypto/sha2/sha512c.c ============================================================================== --- stable/10/sys/crypto/sha2/sha512c.c Thu Mar 2 07:55:47 2017 (r314549) +++ stable/10/sys/crypto/sha2/sha512c.c Thu Mar 2 09:10:39 2017 (r314550) @@ -364,7 +364,7 @@ SHA512_224_Update(SHA512_CTX * ctx, cons } void -SHA512_224_Final(unsigned char digest[static SHA512_224_DIGEST_LENGTH], SHA512_CTX * ctx) +SHA512_224_Final(unsigned char digest[SHA512_224_DIGEST_LENGTH], SHA512_CTX * ctx) { /* Add padding */ @@ -403,7 +403,7 @@ SHA512_256_Update(SHA512_CTX * ctx, cons } void -SHA512_256_Final(unsigned char digest[static SHA512_256_DIGEST_LENGTH], SHA512_CTX * ctx) +SHA512_256_Final(unsigned char digest[SHA512_256_DIGEST_LENGTH], SHA512_CTX * ctx) { /* Add padding */ Modified: stable/10/sys/crypto/sha2/sha512t.h ============================================================================== --- stable/10/sys/crypto/sha2/sha512t.h Thu Mar 2 07:55:47 2017 (r314549) +++ stable/10/sys/crypto/sha2/sha512t.h Thu Mar 2 09:10:39 2017 (r314550) @@ -103,7 +103,7 @@ __BEGIN_DECLS void SHA512_224_Init(SHA512_CTX *); void SHA512_224_Update(SHA512_CTX *, const void *, size_t); -void SHA512_224_Final(unsigned char [static SHA512_224_DIGEST_LENGTH], SHA512_CTX *); +void SHA512_224_Final(unsigned char [SHA512_224_DIGEST_LENGTH], SHA512_CTX *); #ifndef _KERNEL char *SHA512_224_End(SHA512_CTX *, char *); char *SHA512_224_Data(const void *, unsigned int, char *); @@ -112,7 +112,7 @@ char *SHA512_224_FileChunk(const char #endif void SHA512_256_Init(SHA512_CTX *); void SHA512_256_Update(SHA512_CTX *, const void *, size_t); -void SHA512_256_Final(unsigned char [static SHA512_256_DIGEST_LENGTH], SHA512_CTX *); +void SHA512_256_Final(unsigned char [SHA512_256_DIGEST_LENGTH], SHA512_CTX *); #ifndef _KERNEL char *SHA512_256_End(SHA512_CTX *, char *); char *SHA512_256_Data(const void *, unsigned int, char *);