From owner-svn-src-all@freebsd.org Mon Jul 16 19:01:07 2018 Return-Path: Delivered-To: svn-src-all@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 C45211035E1F; Mon, 16 Jul 2018 19:01:07 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7667C7E901; Mon, 16 Jul 2018 19:01:07 +0000 (UTC) (envelope-from cem@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 3EE012093F; Mon, 16 Jul 2018 19:01:07 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6GJ171M072906; Mon, 16 Jul 2018 19:01:07 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6GJ16Gg072901; Mon, 16 Jul 2018 19:01:06 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201807161901.w6GJ16Gg072901@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Mon, 16 Jul 2018 19:01:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336352 - in head/sys: geom/eli kgssapi/krb5 X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: in head/sys: geom/eli kgssapi/krb5 X-SVN-Commit-Revision: 336352 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.27 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: Mon, 16 Jul 2018 19:01:08 -0000 Author: cem Date: Mon Jul 16 19:01:05 2018 New Revision: 336352 URL: https://svnweb.freebsd.org/changeset/base/336352 Log: OCF: Convert consumers to the session id typedef These were missed in the earlier r336269. No functional change. Sponsored by: Dell EMC Isilon Modified: head/sys/geom/eli/g_eli.h head/sys/geom/eli/g_eli_crypto.c head/sys/kgssapi/krb5/kcrypto_aes.c head/sys/kgssapi/krb5/kcrypto_des.c head/sys/kgssapi/krb5/kcrypto_des3.c Modified: head/sys/geom/eli/g_eli.h ============================================================================== --- head/sys/geom/eli/g_eli.h Mon Jul 16 18:53:28 2018 (r336351) +++ head/sys/geom/eli/g_eli.h Mon Jul 16 19:01:05 2018 (r336352) @@ -179,7 +179,7 @@ struct g_eli_worker { struct g_eli_softc *w_softc; struct proc *w_proc; u_int w_number; - uint64_t w_sid; + crypto_session_t w_sid; boolean_t w_active; LIST_ENTRY(g_eli_worker) w_next; }; Modified: head/sys/geom/eli/g_eli_crypto.c ============================================================================== --- head/sys/geom/eli/g_eli_crypto.c Mon Jul 16 18:53:28 2018 (r336351) +++ head/sys/geom/eli/g_eli_crypto.c Mon Jul 16 19:01:05 2018 (r336352) @@ -64,7 +64,7 @@ g_eli_crypto_cipher(u_int algo, int enc, u_char *data, struct cryptoini cri; struct cryptop *crp; struct cryptodesc *crd; - uint64_t sid; + crypto_session_t sid; u_char *p; int error; Modified: head/sys/kgssapi/krb5/kcrypto_aes.c ============================================================================== --- head/sys/kgssapi/krb5/kcrypto_aes.c Mon Jul 16 18:53:28 2018 (r336351) +++ head/sys/kgssapi/krb5/kcrypto_aes.c Mon Jul 16 19:01:05 2018 (r336352) @@ -45,8 +45,8 @@ __FBSDID("$FreeBSD$"); struct aes_state { struct mtx as_lock; - uint64_t as_session_aes; - uint64_t as_session_sha1; + crypto_session_t as_session_aes; + crypto_session_t as_session_sha1; }; static void Modified: head/sys/kgssapi/krb5/kcrypto_des.c ============================================================================== --- head/sys/kgssapi/krb5/kcrypto_des.c Mon Jul 16 18:53:28 2018 (r336351) +++ head/sys/kgssapi/krb5/kcrypto_des.c Mon Jul 16 19:01:05 2018 (r336352) @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); struct des1_state { struct mtx ds_lock; - uint64_t ds_session; + crypto_session_t ds_session; }; static void Modified: head/sys/kgssapi/krb5/kcrypto_des3.c ============================================================================== --- head/sys/kgssapi/krb5/kcrypto_des3.c Mon Jul 16 18:53:28 2018 (r336351) +++ head/sys/kgssapi/krb5/kcrypto_des3.c Mon Jul 16 19:01:05 2018 (r336352) @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); struct des3_state { struct mtx ds_lock; - uint64_t ds_session; + crypto_session_t ds_session; }; static void