--- libaitio/src/crypt.c 2011/04/19 20:00:31 1.2 +++ libaitio/src/crypt.c 2013/03/13 14:54:39 1.9 @@ -1,19 +1,57 @@ /************************************************************************* -* (C) 2010 AITNET ltd - Sofia/Bulgaria - -* by Michael Pounov +* (C) 2010 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov * * $Author: misho $ -* $Id: crypt.c,v 1.2 2011/04/19 20:00:31 misho Exp $ +* $Id: crypt.c,v 1.9 2013/03/13 14:54:39 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 + +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 + by Michael Pounov . 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 +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" /* - * ioCipher() Cipher wrapper for all supported crypto algorythms + * ioCipher() - Cipher wrapper for all supported crypto algorythms + * * @pInput = input buffer * @inLen = input buffer len - * @ppOutput = output allocated buffe, must be free after use + * @ppOutput = output allocated buffe, must be e_free after use * @Cipher = cipher engine, like EVP_bf_cbc() or etc... * @pKey = key * @pIV = IV, salt (8 bytes) @@ -30,7 +68,7 @@ ioCipher(u_char *pInput, int inLen, u_char **ppOutput, if (!pInput || !inLen || !ppOutput || nMode & 0xFFFFFFFE) return 0; - buf = malloc(inLen + EVP_MAX_BLOCK_LENGTH); + buf = e_malloc(inLen + EVP_MAX_BLOCK_LENGTH); if (!buf) { LOGERR; goto end; @@ -46,7 +84,7 @@ ioCipher(u_char *pInput, int inLen, u_char **ppOutput, if (!EVP_CipherUpdate(&ctx, buf + outlen, &buflen, pos, chunk)) { EVP_CIPHER_CTX_cleanup(&ctx); outlen = 0; - free(buf); + e_free(buf); buf = NULL; goto end; } else { @@ -59,7 +97,7 @@ ioCipher(u_char *pInput, int inLen, u_char **ppOutput, } if (!EVP_CipherFinal_ex(&ctx, buf + outlen, &buflen)) { outlen = 0; - free(buf); + e_free(buf); buf = NULL; } else outlen += buflen; @@ -71,10 +109,11 @@ end: } /* - * io_Blowfish() Blowfish cipher algorythm, work with ASCII hex strings + * io_Blowfish() - Blowfish cipher algorythm, work with ASCII hex strings + * * @pInput = input buffer * @inLen = input buffer len - * @ppOutput = output allocated buffe, must be free after use + * @ppOutput = output allocated buffe, must be e_free after use * @pKey = key * @pIV = IV, salt (8 bytes) * @nMode = Mode 0 - decrypting or 1 - encrypting @@ -93,10 +132,10 @@ io_Blowfish(u_char *pInput, int inLen, u_char **ppOutp if (nMode) { len = strlen((char*) pInput); - str = strdup((char*) pInput); + str = e_strdup((char*) pInput); } else { len = strlen((char*) pInput) / 2; - str = malloc(len + 1); + str = e_malloc(len + 1); if (!str) { LOGERR; return 0; @@ -110,11 +149,11 @@ io_Blowfish(u_char *pInput, int inLen, u_char **ppOutp } ret = len = ioCipher((u_char*) str, len, &buf, EVP_bf_cbc(), pKey, pIV, nMode); - free(str); + e_free(str); if (nMode) { ret *= 2; - *ppOutput = malloc(ret + 1); + *ppOutput = e_malloc(ret + 1); if (!*ppOutput) { LOGERR; return 0; @@ -128,7 +167,57 @@ io_Blowfish(u_char *pInput, int inLen, u_char **ppOutp } } else if (ret && buf) - *ppOutput = (u_char*) strdup((char*) buf); + *ppOutput = (u_char*) e_strdup((char*) buf); return ret; +} + +/* + * 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 e_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(u_char *pInput, int inLen, u_char **ppOutput, u_char *pKey, u_char IV[AES_BLOCK_SIZE]) +{ + u_int num; + AES_KEY key; + u_char ecount_buf[AES_BLOCK_SIZE] = { 0 }; + int total = 0; + + if (!pInput || !inLen || !ppOutput) + return -1; + + *ppOutput = e_malloc(inLen); + if (!*ppOutput) { + LOGERR; + return -1; + } else + memset(*ppOutput, 0, inLen); + + AES_set_encrypt_key(pKey, 128, &key); + + while (inLen) { + num = 0; + memset(ecount_buf, 0, sizeof ecount_buf); + AES_ctr128_encrypt(pInput + total, (*ppOutput) + total, + (inLen / (AES_BLOCK_SIZE - 1)) ? (AES_BLOCK_SIZE - 1) : inLen, + &key, IV, ecount_buf, &num); + if (num < 1) { + e_free(*ppOutput); + *ppOutput = NULL; + total = -1; + break; + } else { + total += num; + inLen -= num; + } + } + + return total; }