--- embedtools/src/voucher.c	2012/07/22 22:46:48	1.2
+++ embedtools/src/voucher.c	2014/02/05 15:44:06	1.3
@@ -1,3 +1,48 @@
+/*************************************************************************
+ * (C) 2011 AITNET - Sofia/Bulgaria - <office@aitbg.com>
+ *  by Michael Pounov <misho@aitbg.com>
+ *
+ * $Author: misho $
+ * $Id: voucher.c,v 1.3 2014/02/05 15:44:06 misho Exp $
+ *
+ *************************************************************************
+The ELWIX and AITNET software is distributed under the following
+terms:
+
+All of the documentation and software included in the ELWIX and AITNET
+Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
+
+Copyright 2004 - 2014
+	by Michael Pounov <misho@elwix.org>.  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.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #include "global.h"
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
@@ -31,7 +76,7 @@ Usage()
 static void
 AtExit()
 {
-	io_freeVars(&vs);
+	ait_freeVars(&vs);
 	if (output != stdout)
 		fclose(output);
 }
@@ -113,8 +158,8 @@ ShowConfig(char mode, int rid, int cnt)
 	else
 		printf(">>> Test voucher ticket(s) %d\n", cnt);
 
-	for (i = 0; i < io_arraySize(vs); i++)
-		printf(" + Voucher[%d]= %s\n", i, AIT_GET_STR(io_getVars(&vs, i)));
+	for (i = 0; i < array_Size(vs); i++)
+		printf(" + Voucher[%d]= %s\n", i, AIT_GET_STR(ait_getVars(&vs, i)));
 	printf(" + Roll ID %d bits\n", (int) 
 			strtol(cfg_getAttribute(&cfg, "voucher", "rollbits"), NULL, 0));
 	printf(" + Ticket ID %d bits\n", (int) 
@@ -289,8 +334,8 @@ TestVouchers(array_t * __restrict v, RSA * __restrict 
 		magic ^= magic;
 	}
 
-	for (i = 0, code = 0; i < io_arraySize(v); i++, code = 0) {
-		voucher = AIT_GET_STR(io_getVars(&v, i));
+	for (i = 0, code = 0; i < array_Size(v); i++, code = 0) {
+		voucher = AIT_GET_STR(ait_getVars((array_t**) &v, i));
 
 		/* convert from voucher string to number */
 		p = (u_char*) strrchr(voucher, '\0'); 
@@ -395,9 +440,9 @@ main(int argc, char **argv)
 		rid = strtol(argv[0], NULL, 0);
 	} else {
 		cnt = argc;
-		vs = io_allocVars(cnt);
+		vs = ait_allocVars(cnt);
 		for (i = 0; i < argc; i++)
-			AIT_SET_STR(io_getVars(&vs, i), argv[i]);
+			AIT_SET_STR(ait_getVars(&vs, i), argv[i]);
 	}
 
 	if (cfgLoadConfig(szConfig, &cfg)) {