 @@ -1,14 +1,14 @@
-/*	$NetBSD: h_ioctl.c,v 1.2 2017/06/13 08:16:16 martin Exp $	*/
+/*	$NetBSD: h_ioctl.c,v 1.3 2017/06/14 21:43:02 christos Exp $	*/
 /*-
  * Copyright (c) 2017 Internet Initiative Japan Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -47,174 +47,171 @@ unsigned char aes_key[AES_KEY_LEN] =
 #define AES_IV_LEN 16
 unsigned char aes_iv[AES_IV_LEN] =
 { 0x3d, 0xaf, 0xba, 0x42, 0x9d, 0x9e, 0xb4, 0x30,
 xb4, 0x22, 0xda, 0x80, 0x2c, 0x9f, 0xac, 0x41, };
 #define AES_PLAINTX_LEN 64
 unsigned char aes_plaintx[AES_PLAINTX_LEN] = "Single block msg";
 #define AES_CIPHER_LEN 64
 unsigned char aes_cipher[AES_CIPHER_LEN] =
 { 0xe3, 0x53, 0x77, 0x9c, 0x10, 0x79, 0xae, 0xb8,
 x27, 0x08, 0x94, 0x2d, 0xbe, 0x77, 0x18, 0x1a, };
 #define COUNT 2
 /*
  * CRIOGET is deprecated.
  */
 /*
  * CIOCNGSESSION
  * Hmm, who uses? (1)
  */
 static int
 test_ngsession(int fd)
+{
 	int ret;
 	struct crypt_sgop sg;
-	struct session_n_op css[2];
+	struct session_n_op css[COUNT];
 	const size_t cs_count = __arraycount(css);
-	for (size_t i = 0; i < cs_count; i++) {
+	for (size_t i = 0; i < COUNT; i++) {
 		struct session_n_op *cs = &css[i];
 		memset(cs, 0, sizeof(*cs));
 		cs->cipher = CRYPTO_AES_CBC;
 		cs->keylen = AES_KEY_LEN;
 		cs->key = __UNCONST(&aes_key);
+	}
 	memset(&sg, 0, sizeof(sg));
-	sg.count = cs_count;
+	sg.count = COUNT;
 	sg.sessions = css;
 	ret = ioctl(fd, CIOCNGSESSION, &sg);
 	if (ret < 0)
 		fprintf(stderr, "failed: CIOCNGSESSION\n");
 	return ret;
+}
 /*
  * CIOCNFSESSION
  * Hmm, who uses? (2)
  */
 static int
 test_nfsession(int fd)
+{
 	int ret;
 	struct crypt_sfop sf;
-	u_int32_t sids[2];
+	u_int32_t sids[COUNT];
 	const size_t sid_count = __arraycount(sids);
 	memset(sids, 0, sizeof(sids));
 	memset(&sf, 0, sizeof(sf));
-	sf.count = sid_count;
+	sf.count = COUNT;
 	sf.sesid = sids;
 	ret = ioctl(fd, CIOCNFSESSION, &sf);
 	if (ret < 0)
 		fprintf(stderr, "failed: CIOCNFSESSION\n");
 	return ret;
+}
 /*
  * CIOCNCRYPTM
  * Hmm, who uses? (3)
  */
 static int
 test_ncryptm(int fd)
+{
 	int ret;
 	struct crypt_mop mop;
-	struct crypt_n_op css[2];
+	struct crypt_n_op css[COUNT];
 	const size_t cs_count = __arraycount(css);
-	for (size_t i = 0; i < cs_count; i++) {
+	for (size_t i = 0; i < COUNT; i++) {
 		struct crypt_n_op *cs;
 		cs = &css[i];
 		memset(cs, 0, sizeof(*cs));
 		cs->ses = 0; /* session id */
 		cs->op = COP_ENCRYPT;
 		/* XXX */
+	}
 	memset(&mop, 0, sizeof(mop));
-	mop.count = cs_count;
+	mop.count = COUNT;
 	mop.reqs = css;
 	ret = ioctl(fd, CIOCNCRYPTM, &mop);
 	if (ret < 0)
 		fprintf(stderr, "failed: CIOCNCRYPTM\n");
 	return ret;
+}
 /*
  * CIOCNCRYPTRETM
  * Hmm, who uses? (4)
  */
 static int
 test_ncryptretm(int fd)
+{
 	int ret;
 	struct session_op cs;
 	struct crypt_mop mop;
-	struct crypt_n_op cnos[2];
+	struct crypt_n_op cnos[COUNT];
-	const size_t req_count = __arraycount(cnos);
+	unsigned char cno_dst[COUNT][AES_CIPHER_LEN];
 	unsigned char cno_dst[req_count][AES_CIPHER_LEN];
 	struct cryptret cret;
-	struct crypt_result crs[req_count];
+	struct crypt_result crs[COUNT];
 	memset(&cs, 0, sizeof(cs));
 	cs.cipher = CRYPTO_AES_CBC;
 	cs.keylen = AES_KEY_LEN;
 	cs.key = __UNCONST(&aes_key);
 	ret = ioctl(fd, CIOCGSESSION, &cs);
 	if (ret < 0) {
 		fprintf(stderr, "failed: CIOCGSESSION\n");
 		return ret;
+	}
-	for (size_t i = 0; i < req_count; i++) {
+	for (size_t i = 0; i < COUNT; i++) {
 		struct crypt_n_op *cno = &cnos[i];
 		memset(cno, 0, sizeof(*cno));
 		cno->ses = cs.ses;
 		cno->op = COP_ENCRYPT;
 		cno->len = AES_PLAINTX_LEN;
 		cno->src = aes_plaintx;
 		cno->dst_len = AES_CIPHER_LEN;
 		cno->dst = cno_dst[i];
+	}
 	memset(&mop, 0, sizeof(mop));
-	mop.count = req_count;
+	mop.count = COUNT;
 	mop.reqs = cnos;
 	ret = ioctl(fd, CIOCNCRYPTM, &mop);
 	if (ret < 0)
 		fprintf(stderr, "failed: CIOCNCRYPTM\n");
-	for (size_t i = 0; i < req_count; i++) {
+	for (size_t i = 0; i < COUNT; i++) {
 		struct crypt_result *cr = &crs[i];
 		memset(cr, 0, sizeof(*cr));
 		cr->reqid = cnos[i].reqid;
+	}
 	memset(&cret, 0, sizeof(cret));
-	cret.count = req_count;
+	cret.count = COUNT;
 	cret.results = crs;
 	ret = ioctl(fd, CIOCNCRYPTRETM, &cret);
 	if (ret < 0)
 		fprintf(stderr, "failed: CIOCNCRYPTRETM\n");
 	return ret;
+}
 /*
  * CIOCNCRYPTRET
  * Hmm, who uses? (5)
  */
 /* test when it does not request yet. */