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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
