--- libaitio/inc/aitio.h	2011/10/04 14:33:32	1.11.2.22
+++ libaitio/inc/aitio.h	2011/10/14 07:28:16	1.11.2.26
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.11.2.22 2011/10/04 14:33:32 misho Exp $
+* $Id: aitio.h,v 1.11.2.26 2011/10/14 07:28:16 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -51,6 +51,7 @@ SUCH DAMAGE.
 
 #include <assert.h>
 #include <openssl/evp.h>
+#include <openssl/aes.h>
 #include <sys/tty.h>
 #include <sys/ioctl_compat.h>
 
@@ -231,7 +232,11 @@ typedef struct {
 						AIT_LEN(__val) = 0; \
 					} while (0)
 
+struct io_ether_addr {
+	u_int8_t ether_addr_octet[6];
+};
 
+
 // io_GetErrno() Get error code of last operation
 inline int io_GetErrno();
 // io_GetError() Get error text of last operation
@@ -239,6 +244,15 @@ inline const char *io_GetError();
 
 
 /*
+ * io_ether_ntoa() Convert ethernet address to string
+ * @n = ethernet address structure, like struct ether_addr
+ * @a = string
+ * @len = string length
+ * return: NULL error or !=NULL string a
+ */
+inline char *io_ether_ntoa(const struct io_ether_addr *n, char * __restrict a, int len);
+
+/*
  * io_vals2buffer() Marshaling data from array with variables to buffer
  * @buf = Buffer
  * @buflen = Size of buffer
@@ -753,6 +767,17 @@ int ioCipher(unsigned char *pInput, int inLen, unsigne
 */
 int io_Blowfish(unsigned char *pInput, int inLen, unsigned char **ppOutput, 
 		unsigned char *pKey, unsigned char *pIV, int nMode);
+/*
+ * io_ctr_AES() Encrypt/Decrypt stream cipher CTR_AES
+ * @pInput = Input buffer with ASCII
+ * @inLen = Input buffer data length
+ * @ppOutput = Output buffer with cipher data, must be free after use
+ * @pKey = Key
+ * @IV = IVector/Nonce/Counter, Warning: IV must be variable, because we write there!!!
+ * return: -1 error or >-1 how many cipher blocks proceeded
+ */
+int io_ctr_AES(unsigned char *pInput, int inLen, unsigned char **ppOutput, 
+		unsigned char *pKey, unsigned char IV[AES_BLOCK_SIZE]);
 
 
 /*
@@ -783,7 +808,8 @@ inline void ioFreePTY(int ptyfd, const char *ttyname);
  * @ypxl = y pixels
  * return: -1 error or 0 ok
  */
-inline int ioChgWinPTY(int ptyfd, u_short row, u_short col, u_short xpxl, u_short ypxl);
+inline int ioChgWinPTY(int ptyfd, unsigned short row, unsigned short col, 
+		unsigned short xpxl, unsigned short ypxl);
 /*
  * ioSetOwnerTTY() Set owner to TTY
  * @ttyname = tty filename