From owner-svn-src-all@freebsd.org Fri Nov 6 18:09:53 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 74C874457C3; Fri, 6 Nov 2020 18:09:53 +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 4CST1s2j0Kz4Z2F; Fri, 6 Nov 2020 18:09:53 +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 4F84928E6C; Fri, 6 Nov 2020 18:09:53 +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 0A6I9rlT050915; Fri, 6 Nov 2020 18:09:53 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A6I9rWF050914; Fri, 6 Nov 2020 18:09:53 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202011061809.0A6I9rWF050914@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 6 Nov 2020 18:09:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367426 - head/sys/opencrypto X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/opencrypto X-SVN-Commit-Revision: 367426 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.34 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: Fri, 06 Nov 2020 18:09:53 -0000 Author: jhb Date: Fri Nov 6 18:09:52 2020 New Revision: 367426 URL: https://svnweb.freebsd.org/changeset/base/367426 Log: Use void * in place of caddr_t. Reviewed by: markj Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D27065 Modified: head/sys/opencrypto/cryptodev.h Modified: head/sys/opencrypto/cryptodev.h ============================================================================== --- head/sys/opencrypto/cryptodev.h Fri Nov 6 18:05:29 2020 (r367425) +++ head/sys/opencrypto/cryptodev.h Fri Nov 6 18:09:52 2020 (r367426) @@ -220,9 +220,9 @@ struct session_op { uint32_t mac; /* ie. CRYPTO_SHA2_256_HMAC */ uint32_t keylen; /* cipher key */ - c_caddr_t key; + const void *key; int mackeylen; /* mac key */ - c_caddr_t mackey; + const void *mackey; uint32_t ses; /* returns: session # */ }; @@ -237,9 +237,9 @@ struct session2_op { uint32_t mac; /* ie. CRYPTO_SHA2_256_HMAC */ uint32_t keylen; /* cipher key */ - c_caddr_t key; + const void *key; int mackeylen; /* mac key */ - c_caddr_t mackey; + const void *mackey; uint32_t ses; /* returns: session # */ int crid; /* driver id + flags (rw) */ @@ -255,10 +255,10 @@ struct crypt_op { #define COP_F_CIPHER_FIRST 0x0001 /* Cipher before MAC. */ #define COP_F_BATCH 0x0008 /* Batch op if possible */ u_int len; - c_caddr_t src; /* become iov[] inside kernel */ - caddr_t dst; - caddr_t mac; /* must be big enough for chosen MAC */ - c_caddr_t iv; + const void *src; /* become iov[] inside kernel */ + void *dst; + void *mac; /* must be big enough for chosen MAC */ + const void *iv; }; /* op and flags the same as crypt_op */ @@ -269,11 +269,11 @@ struct crypt_aead { u_int len; u_int aadlen; u_int ivlen; - c_caddr_t src; /* become iov[] inside kernel */ - caddr_t dst; - c_caddr_t aad; /* additional authenticated data */ - caddr_t tag; /* must fit for chosen TAG length */ - c_caddr_t iv; + const void *src; /* become iov[] inside kernel */ + void *dst; + const void *aad; /* additional authenticated data */ + void *tag; /* must fit for chosen TAG length */ + const void *iv; }; /* @@ -288,7 +288,7 @@ struct crypt_find_op { /* bignum parameter, in packed bytes, ... */ struct crparam { - caddr_t crp_p; + void *crp_p; u_int crp_nbits; };