svn commit: r322935 - head/sys/boot/geli

[Warner Losh]

Author: imp
Date: Sat Aug 26 18:29:58 2017
New Revision: 322935
URL: https://svnweb.freebsd.org/changeset/base/322935

Log:
  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

Modified:
  head/sys/boot/geli/geliboot_crypto.c

Modified: head/sys/boot/geli/geliboot_crypto.c
==============================================================================
--- head/sys/boot/geli/geliboot_crypto.c	Sat Aug 26 18:29:53 2017	(r322934)
+++ head/sys/boot/geli/geliboot_crypto.c	Sat Aug 26 18:29:58 2017	(r322935)
@@ -82,17 +82,17 @@ geliboot_crypt(u_int algo, int enc, u_char *data, size
 		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;
 		}