Fix libstand build breakage after r361298.

- Use enc_xform_aes_xts.setkey() directly instead of duplicating the code
  now that it no longer calls malloc().
- Rather than bringing back all of xform_userland.h, add a conditional
  #include of <stand.h> to xform_enc.h.
- Update calls to encrypt/decrypt callbacks in enc_xform_aes_xts for
  separate input/output pointers.

Pointy hat to:	jhb

1 files changed, 6 insertions, 6 deletions

diff --git a/stand/libsa/geli/geliboot_crypto.c b/stand/libsa/geli/geliboot_crypto.c
index 82a137c06212..e2de7bba4cf5 100644
--- a/stand/libsa/geli/geliboot_crypto.c
+++ b/stand/libsa/geli/geliboot_crypto.c
@@ -78,20 +78,20 @@ geliboot_crypt(u_int algo, int enc, u_char *data, size_t datasize,
 		xts_len = keysize << 1;
 		ctxp = &xtsctx;
 
-		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((caddr_t)ctxp, iv);
+		enc_xform_aes_xts.setkey(ctxp, key, xts_len / 8);
+		enc_xform_aes_xts.reinit(ctxp, iv);
 
 		switch (enc) {
 		case 0: /* decrypt */
 			for (i = 0; i < datasize; i += AES_XTS_BLOCKSIZE) {
-				enc_xform_aes_xts.decrypt((caddr_t)ctxp, data + i);
+				enc_xform_aes_xts.decrypt(ctxp, data + i,
+				    data + i);
 			}
 			break;
 		case 1: /* encrypt */
 			for (i = 0; i < datasize; i += AES_XTS_BLOCKSIZE) {
-				enc_xform_aes_xts.encrypt((caddr_t)ctxp, data + i);
+				enc_xform_aes_xts.encrypt(ctxp, data + i,
+				    data + 1);
 			}
 			break;
 		}