From nobody Tue Dec 28 17:51:08 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6F92A190F35E; Tue, 28 Dec 2021 17:51:10 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JNhsm742nz3F3h; Tue, 28 Dec 2021 17:51:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BBE8F16119; Tue, 28 Dec 2021 17:51:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BSHp8gV052669; Tue, 28 Dec 2021 17:51:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BSHp81N052668; Tue, 28 Dec 2021 17:51:08 GMT (envelope-from git) Date: Tue, 28 Dec 2021 17:51:08 GMT Message-Id: <202112281751.1BSHp81N052668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e7d4d580302d - main - sys/crypto: Use C99 fixed-width integer types. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7d4d580302d0b769d232405f312f73c30d168c8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640713869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DlMxh9YXW+GHOPl/J8NN4hb8QH0uQ18C5zbYXLGvPB0=; b=tDyMXslmaDbc7zh6NPFf6+Y/L/66LoCnwLcdHbjsR41uPIyPWw3ynTV/7N0/uhNwqhVtn9 xb+5SJ4/Bmm77QGYirFO1SkfwVmr2Nix0RP6ebU/nl7v8qlwOkRBN4nYXLVaznzUWd/MDE ONPGy+l57YH6c6i/txx4ES9w2gk7KzAkZYBSqmMsOytZkdgCQqGWHw8MfU1rbyCG9RRoPW mFk2pMMZF+24t2/iPKO1LfWn7wBJ6hDQP43UsoFuaoxs8kr+WEIhGFAnyvIr2PA98GXvYj AWEzbOxaKUUpJakEOm4tHt9CQ7s3zPzOtAhEUFaVbwGtRbNzpLT+wRhn0kGVDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640713869; a=rsa-sha256; cv=none; b=td8KT7zvGfwc0Iv2sSpK1NNy0YN/mfOei7VjYhiB8FXgbUtw8+zuJFqtjf95B2ZkkNjA5I t/JBZqC0IBIataL3uzGnx8nETd+EaaskedMcKsl/qOezaiuJGB0LxSIZTbVEVdvCzSDIKC Bj+tbawKO+V9b+VczLsz1ZNbeBKlX4Nkkj4zXYOnQGRQ5IesPVdhOjU1NiokYWaAzEhklC 4050LCDmm3/5NJ+SJ9cfnH3VMOQBq6UP97Hmjb8nO9Toe3CHEj2dk/KrkxJmpRrGZzwVJL BIszxAA4raGnKz8jm7jWryhmebMdCh002Ju32TDIPCwTHlZP1jn+vKrnU37ujw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e7d4d580302d0b769d232405f312f73c30d168c8 commit e7d4d580302d0b769d232405f312f73c30d168c8 Author: John Baldwin AuthorDate: 2021-12-28 17:41:38 +0000 Commit: John Baldwin CommitDate: 2021-12-28 17:41:38 +0000 sys/crypto: Use C99 fixed-width integer types. No functional change. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D33633 --- sys/crypto/rijndael/rijndael-api-fst.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/crypto/rijndael/rijndael-api-fst.h b/sys/crypto/rijndael/rijndael-api-fst.h index e5f596ac75f8..0bbc8cb8b72b 100644 --- a/sys/crypto/rijndael/rijndael-api-fst.h +++ b/sys/crypto/rijndael/rijndael-api-fst.h @@ -40,34 +40,34 @@ /* The structure for key information */ typedef struct { - u_int8_t direction; /* Key used for encrypting or decrypting? */ + uint8_t direction; /* Key used for encrypting or decrypting? */ int keyLen; /* Length of the key */ char keyMaterial[RIJNDAEL_MAX_KEY_SIZE+1]; /* Raw key data in ASCII, e.g., user input or KAT values */ int Nr; /* key-length-dependent number of rounds */ - u_int32_t rk[4*(RIJNDAEL_MAXNR + 1)]; /* key schedule */ - u_int32_t ek[4*(RIJNDAEL_MAXNR + 1)]; /* CFB1 key schedule (encryption only) */ + uint32_t rk[4*(RIJNDAEL_MAXNR + 1)]; /* key schedule */ + uint32_t ek[4*(RIJNDAEL_MAXNR + 1)]; /* CFB1 key schedule (encryption only) */ } keyInstance; /* The structure for cipher information */ typedef struct { /* changed order of the components */ - u_int8_t mode; /* MODE_ECB, MODE_CBC, or MODE_CFB1 */ - u_int8_t IV[RIJNDAEL_MAX_IV_SIZE]; /* A possible Initialization Vector for ciphering */ + uint8_t mode; /* MODE_ECB, MODE_CBC, or MODE_CFB1 */ + uint8_t IV[RIJNDAEL_MAX_IV_SIZE]; /* A possible Initialization Vector for ciphering */ } cipherInstance; /* Function prototypes */ -int rijndael_makeKey(keyInstance *, u_int8_t, int, const char *); +int rijndael_makeKey(keyInstance *, uint8_t, int, const char *); -int rijndael_cipherInit(cipherInstance *, u_int8_t, char *); +int rijndael_cipherInit(cipherInstance *, uint8_t, char *); -int rijndael_blockEncrypt(cipherInstance *, keyInstance *, const u_int8_t *, - int, u_int8_t *); -int rijndael_padEncrypt(cipherInstance *, keyInstance *, const u_int8_t *, - int, u_int8_t *); +int rijndael_blockEncrypt(cipherInstance *, keyInstance *, const uint8_t *, + int, uint8_t *); +int rijndael_padEncrypt(cipherInstance *, keyInstance *, const uint8_t *, + int, uint8_t *); -int rijndael_blockDecrypt(cipherInstance *, keyInstance *, const u_int8_t *, - int, u_int8_t *); -int rijndael_padDecrypt(cipherInstance *, keyInstance *, const u_int8_t *, - int, u_int8_t *); +int rijndael_blockDecrypt(cipherInstance *, keyInstance *, const uint8_t *, + int, uint8_t *); +int rijndael_padDecrypt(cipherInstance *, keyInstance *, const uint8_t *, + int, uint8_t *); #endif /* __RIJNDAEL_API_FST_H */