From owner-svn-src-head@freebsd.org Tue Sep 18 15:32:04 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B1DB910A11AF; Tue, 18 Sep 2018 15:32:04 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 29C927547F; Tue, 18 Sep 2018 15:32:03 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id w8IFVsSh019423; Tue, 18 Sep 2018 08:31:54 -0700 (PDT) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id w8IFVsSA019422; Tue, 18 Sep 2018 08:31:54 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201809181531.w8IFVsSA019422@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r338749 - head/sys/netinet In-Reply-To: <201809181053.w8IAr7Rm047398@repo.freebsd.org> To: Michael Tuexen Date: Tue, 18 Sep 2018 08:31:54 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Sep 2018 15:32:04 -0000 > Author: tuexen > Date: Tue Sep 18 10:53:07 2018 > New Revision: 338749 > URL: https://svnweb.freebsd.org/changeset/base/338749 > > Log: > Remove unused code. This type of commit log entry is almost useless when someone is reading a svn log. In the future could you please indicate what was removed, ie: Log: Removed unused sctp_verify_hmac function. Thanks, Rod > > Approved by: re (kib@) > MFC after: 1 week > > Modified: > head/sys/netinet/sctp_auth.c > head/sys/netinet/sctp_auth.h > > Modified: head/sys/netinet/sctp_auth.c > ============================================================================== > --- head/sys/netinet/sctp_auth.c Tue Sep 18 07:29:01 2018 (r338748) > +++ head/sys/netinet/sctp_auth.c Tue Sep 18 10:53:07 2018 (r338749) > @@ -1060,40 +1060,6 @@ sctp_hmac_m(uint16_t hmac_algo, uint8_t *key, uint32_t > return (digestlen); > } > > -/*- > - * verify the HMAC digest using the desired hash key, text, and HMAC > - * algorithm. > - * Returns -1 on error, 0 on success. > - */ > -int > -sctp_verify_hmac(uint16_t hmac_algo, uint8_t *key, uint32_t keylen, > - uint8_t *text, uint32_t textlen, > - uint8_t *digest, uint32_t digestlen) > -{ > - uint32_t len; > - uint8_t temp[SCTP_AUTH_DIGEST_LEN_MAX]; > - > - /* sanity check the material and length */ > - if ((key == NULL) || (keylen == 0) || > - (text == NULL) || (textlen == 0) || (digest == NULL)) { > - /* can't do HMAC with empty key or text or digest */ > - return (-1); > - } > - len = sctp_get_hmac_digest_len(hmac_algo); > - if ((len == 0) || (digestlen != len)) > - return (-1); > - > - /* compute the expected hash */ > - if (sctp_hmac(hmac_algo, key, keylen, text, textlen, temp) != len) > - return (-1); > - > - if (memcmp(digest, temp, digestlen) != 0) > - return (-1); > - else > - return (0); > -} > - > - > /* > * computes the requested HMAC using a key struct (which may be modified if > * the keylen exceeds the HMAC block len). > > Modified: head/sys/netinet/sctp_auth.h > ============================================================================== > --- head/sys/netinet/sctp_auth.h Tue Sep 18 07:29:01 2018 (r338748) > +++ head/sys/netinet/sctp_auth.h Tue Sep 18 10:53:07 2018 (r338749) > @@ -178,9 +178,6 @@ extern uint32_t sctp_get_hmac_digest_len(uint16_t hmac > extern uint32_t > sctp_hmac(uint16_t hmac_algo, uint8_t *key, uint32_t keylen, > uint8_t *text, uint32_t textlen, uint8_t *digest); > -extern int > -sctp_verify_hmac(uint16_t hmac_algo, uint8_t *key, uint32_t keylen, > - uint8_t *text, uint32_t textlen, uint8_t *digest, uint32_t digestlen); > extern uint32_t > sctp_compute_hmac(uint16_t hmac_algo, sctp_key_t *key, > uint8_t *text, uint32_t textlen, uint8_t *digest); > > -- Rod Grimes rgrimes@freebsd.org