diff --git a/sys/geom/eli/g_eli.h b/sys/geom/eli/g_eli.h
index b46728570aa9..5141081710a5 100644
--- a/sys/geom/eli/g_eli.h
+++ b/sys/geom/eli/g_eli.h
@@ -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;
 };
diff --git a/sys/geom/eli/g_eli_crypto.c b/sys/geom/eli/g_eli_crypto.c
index 6149caafef30..348b13c0d92d 100644
--- a/sys/geom/eli/g_eli_crypto.c
+++ b/sys/geom/eli/g_eli_crypto.c
@@ -64,7 +64,7 @@ g_eli_crypto_cipher(u_int algo, int enc, u_char *data, size_t datasize,
 	struct cryptoini cri;
 	struct cryptop *crp;
 	struct cryptodesc *crd;
-	uint64_t sid;
+	crypto_session_t sid;
 	u_char *p;
 	int error;
 
diff --git a/sys/kgssapi/krb5/kcrypto_aes.c b/sys/kgssapi/krb5/kcrypto_aes.c
index c616e2e7d5d3..55d6f6e1c4eb 100644
--- a/sys/kgssapi/krb5/kcrypto_aes.c
+++ b/sys/kgssapi/krb5/kcrypto_aes.c
@@ -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
diff --git a/sys/kgssapi/krb5/kcrypto_des.c b/sys/kgssapi/krb5/kcrypto_des.c
index 333332ab4b71..041b142edae1 100644
--- a/sys/kgssapi/krb5/kcrypto_des.c
+++ b/sys/kgssapi/krb5/kcrypto_des.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 
 struct des1_state {
 	struct mtx	ds_lock;
-	uint64_t	ds_session;
+	crypto_session_t ds_session;
 };
 
 static void
diff --git a/sys/kgssapi/krb5/kcrypto_des3.c b/sys/kgssapi/krb5/kcrypto_des3.c
index 57f5a39478a4..b8dcdfd0fdc6 100644
--- a/sys/kgssapi/krb5/kcrypto_des3.c
+++ b/sys/kgssapi/krb5/kcrypto_des3.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 
 struct des3_state {
 	struct mtx	ds_lock;
-	uint64_t	ds_session;
+	crypto_session_t ds_session;
 };
 
 static void