From owner-svn-src-all@freebsd.org Tue Nov 3 22:32:31 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D5F4846627C; Tue, 3 Nov 2020 22:32:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CQl0H5LQ8z4Y3y; Tue, 3 Nov 2020 22:32:31 +0000 (UTC) (envelope-from jhb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9C1BE21FAC; Tue, 3 Nov 2020 22:32:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A3MWVGj038520; Tue, 3 Nov 2020 22:32:31 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A3MWVh9038517; Tue, 3 Nov 2020 22:32:31 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202011032232.0A3MWVh9038517@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Tue, 3 Nov 2020 22:32:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367310 - in head/sys: crypto opencrypto X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head/sys: crypto opencrypto X-SVN-Commit-Revision: 367310 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Nov 2020 22:32:31 -0000 Author: jhb Date: Tue Nov 3 22:32:30 2020 New Revision: 367310 URL: https://svnweb.freebsd.org/changeset/base/367310 Log: Replace some K&R function definitions with ANSI C. Reviewed by: markj Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D27062 Modified: head/sys/crypto/sha1.c head/sys/opencrypto/cryptodeflate.c head/sys/opencrypto/xform_deflate.c Modified: head/sys/crypto/sha1.c ============================================================================== --- head/sys/crypto/sha1.c Tue Nov 3 22:27:54 2020 (r367309) +++ head/sys/crypto/sha1.c Tue Nov 3 22:32:30 2020 (r367310) @@ -91,8 +91,7 @@ static uint32_t _K[] = { 0x5a827999, 0x6ed9eba1, 0x8f1 static void sha1_step(struct sha1_ctxt *); static void -sha1_step(ctxt) - struct sha1_ctxt *ctxt; +sha1_step(struct sha1_ctxt *ctxt) { uint32_t a, b, c, d, e; size_t t, s; @@ -176,8 +175,7 @@ sha1_step(ctxt) /*------------------------------------------------------------*/ void -sha1_init(ctxt) - struct sha1_ctxt *ctxt; +sha1_init(struct sha1_ctxt *ctxt) { bzero(ctxt, sizeof(struct sha1_ctxt)); H(0) = 0x67452301; @@ -188,8 +186,7 @@ sha1_init(ctxt) } void -sha1_pad(ctxt) - struct sha1_ctxt *ctxt; +sha1_pad(struct sha1_ctxt *ctxt) { size_t padlen; /*pad length in bytes*/ size_t padstart; @@ -223,10 +220,7 @@ sha1_pad(ctxt) } void -sha1_loop(ctxt, input, len) - struct sha1_ctxt *ctxt; - const uint8_t *input; - size_t len; +sha1_loop(struct sha1_ctxt *ctxt, const uint8_t *input, size_t len) { size_t gaplen; size_t gapstart; Modified: head/sys/opencrypto/cryptodeflate.c ============================================================================== --- head/sys/opencrypto/cryptodeflate.c Tue Nov 3 22:27:54 2020 (r367309) +++ head/sys/opencrypto/cryptodeflate.c Tue Nov 3 22:32:30 2020 (r367310) @@ -82,11 +82,7 @@ crypto_zfree(void *nil, void *ptr) */ uint32_t -deflate_global(data, size, decomp, out) - uint8_t *data; - uint32_t size; - int decomp; - uint8_t **out; +deflate_global(uint8_t *data, uint32_t size, int decomp, uint8_t **out) { /* decomp indicates whether we compress (0) or decompress (1) */ Modified: head/sys/opencrypto/xform_deflate.c ============================================================================== --- head/sys/opencrypto/xform_deflate.c Tue Nov 3 22:27:54 2020 (r367309) +++ head/sys/opencrypto/xform_deflate.c Tue Nov 3 22:32:30 2020 (r367310) @@ -68,19 +68,13 @@ struct comp_algo comp_algo_deflate = { */ static uint32_t -deflate_compress(data, size, out) - uint8_t *data; - uint32_t size; - uint8_t **out; +deflate_compress(uint8_t *data, uint32_t size, uint8_t **out) { return deflate_global(data, size, 0, out); } static uint32_t -deflate_decompress(data, size, out) - uint8_t *data; - uint32_t size; - uint8_t **out; +deflate_decompress(uint8_t *data, uint32_t size, uint8_t **out) { return deflate_global(data, size, 1, out); }