mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-12 09:58:36 +00:00
Code Issues Releases Activity

Revert "geom_bde: plug set-but-not-used vars"

Browse Source 
The commit at hand happens to break userspace build as the header ins
included by sbin/gbde/gbde.c and the __diagused macro is not provided to
userspace.

Revert until this gets sorted out.

This reverts commit 26e837e2d4.
This commit is contained in:
Mateusz Guzik 2021-12-09 19:23:05 +00:00
parent df38ada293
commit 8ad5b9498e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/geom/bde/g_bde.h
View File

@ -176,7 +176,7 @@ void g_bde_worker(void *arg);
static __inline void
AES_init(cipherInstance *ci)
{
int error __diagused;
int error;
error = rijndael_cipherInit(ci, MODE_CBC, NULL);
KASSERT(error > 0, ("rijndael_cipherInit %d", error));
@ -185,7 +185,7 @@ AES_init(cipherInstance *ci)
static __inline void
AES_makekey(keyInstance *ki, int dir, u_int len, const void *key)
{
int error __diagused;
int error;
error = rijndael_makeKey(ki, dir, len, key);
KASSERT(error > 0, ("rijndael_makeKey %d", error));
@ -194,7 +194,7 @@ AES_makekey(keyInstance *ki, int dir, u_int len, const void *key)
static __inline void
AES_encrypt(cipherInstance *ci, keyInstance *ki, const void *in, void *out, u_int len)
{
int error __diagused;
int error;
error = rijndael_blockEncrypt(ci, ki, in, len * 8, out);
KASSERT(error > 0, ("rijndael_blockEncrypt %d", error));
@ -203,7 +203,7 @@ AES_encrypt(cipherInstance *ci, keyInstance *ki, const void *in, void *out, u_in
static __inline void
AES_decrypt(cipherInstance *ci, keyInstance *ki, const void *in, void *out, u_int len)
{
int error __diagused;
int error;
error = rijndael_blockDecrypt(ci, ki, in, len * 8, out);
KASSERT(error > 0, ("rijndael_blockDecrypt %d", error));