From f4380fc45dbc36b426facfd10936d005e72705e0 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sat, 26 Aug 2017 18:29:58 +0000 Subject: [PATCH] Fix warnings due to type mismatch. Cast ctxp to caddr_t to pass data as expected. While void * is a universal type, char * isn't (and that's what caddr_t is defined as). One could argue these prototypes should take void * rather than caddr_t, but changing that is much more invasive. Sponsored by: Netflix --- sys/boot/geli/geliboot_crypto.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/boot/geli/geliboot_crypto.c b/sys/boot/geli/geliboot_crypto.c index c3db73f4955..4187e97390b 100644 --- a/sys/boot/geli/geliboot_crypto.c +++ b/sys/boot/geli/geliboot_crypto.c @@ -82,17 +82,17 @@ geliboot_crypt(u_int algo, int enc, u_char *data, size_t datasize, rijndael_set_key(&ctxp->key1, key, xts_len / 2); rijndael_set_key(&ctxp->key2, key + (xts_len / 16), xts_len / 2); - enc_xform_aes_xts.reinit(ctxp, iv); + enc_xform_aes_xts.reinit((caddr_t)ctxp, iv); switch (enc) { case 0: /* decrypt */ for (i = 0; i < datasize; i += AES_XTS_BLOCKSIZE) { - enc_xform_aes_xts.decrypt(ctxp, data + i); + enc_xform_aes_xts.decrypt((caddr_t)ctxp, data + i); } break; case 1: /* encrypt */ for (i = 0; i < datasize; i += AES_XTS_BLOCKSIZE) { - enc_xform_aes_xts.encrypt(ctxp, data + i); + enc_xform_aes_xts.encrypt((caddr_t)ctxp, data + i); } break; }