X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilccrypt%2Fsilccipher.c;h=2264d5cfc51b8212392aaccaf03f2ebf4c9c2821;hp=b233e3f9485d3668fd1cb87769f01f5a623729a4;hb=40f8443d8d3a6577336ee66d18e04d9ac4d956bb;hpb=61af85976e943396cf2cbe9bdaee3e4119c74aec diff --git a/lib/silccrypt/silccipher.c b/lib/silccrypt/silccipher.c index b233e3f9..2264d5cf 100644 --- a/lib/silccrypt/silccipher.c +++ b/lib/silccrypt/silccipher.c @@ -2,15 +2,14 @@ silccipher.c - Author: Pekka Riikonen + Author: Pekka Riikonen - Copyright (C) 1997 - 2001 Pekka Riikonen + Copyright (C) 1997 - 2005 Pekka Riikonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + the Free Software Foundation; version 2 of the License. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -19,7 +18,7 @@ */ /* $Id$ */ -#include "silcincludes.h" +#include "silc.h" #include "ciphers.h" /* Includes cipher definitions */ /* The SilcCipher context */ @@ -37,48 +36,41 @@ SilcDList silc_cipher_list = NULL; /* Static list of ciphers for silc_cipher_register_default(). */ const SilcCipherObject silc_default_ciphers[] = { - { "aes-256-cbc", 16, 256, silc_aes_set_key, + { "aes-256-cbc", 16, 256, silc_aes_set_key, silc_aes_set_key_with_string, silc_aes_encrypt_cbc, silc_aes_decrypt_cbc, silc_aes_context_len }, - { "aes-192-cbc", 16, 192, silc_aes_set_key, + { "aes-192-cbc", 16, 192, silc_aes_set_key, silc_aes_set_key_with_string, silc_aes_encrypt_cbc, silc_aes_decrypt_cbc, silc_aes_context_len }, - { "aes-128-cbc", 16, 128, silc_aes_set_key, + { "aes-128-cbc", 16, 128, silc_aes_set_key, silc_aes_set_key_with_string, silc_aes_encrypt_cbc, silc_aes_decrypt_cbc, silc_aes_context_len }, - { "twofish-256-cbc", 16, 256, silc_twofish_set_key, + { "twofish-256-cbc", 16, 256, silc_twofish_set_key, silc_twofish_set_key_with_string, - silc_twofish_encrypt_cbc, silc_twofish_decrypt_cbc, + silc_twofish_encrypt_cbc, silc_twofish_decrypt_cbc, silc_twofish_context_len }, - { "twofish-192-cbc", 16, 192, silc_twofish_set_key, + { "twofish-192-cbc", 16, 192, silc_twofish_set_key, silc_twofish_set_key_with_string, - silc_twofish_encrypt_cbc, silc_twofish_decrypt_cbc, + silc_twofish_encrypt_cbc, silc_twofish_decrypt_cbc, silc_twofish_context_len }, - { "twofish-128-cbc", 16, 128, silc_twofish_set_key, + { "twofish-128-cbc", 16, 128, silc_twofish_set_key, silc_twofish_set_key_with_string, - silc_twofish_encrypt_cbc, silc_twofish_decrypt_cbc, + silc_twofish_encrypt_cbc, silc_twofish_decrypt_cbc, silc_twofish_context_len }, - { "rc6-256-cbc", 16, 256, silc_rc6_set_key, silc_rc6_set_key_with_string, - silc_rc6_encrypt_cbc, silc_rc6_decrypt_cbc, - silc_rc6_context_len }, - { "rc6-192-cbc", 16, 192, silc_rc6_set_key, silc_rc6_set_key_with_string, - silc_rc6_encrypt_cbc, silc_rc6_decrypt_cbc, - silc_rc6_context_len }, - { "rc6-128-cbc", 16, 128, silc_rc6_set_key, silc_rc6_set_key_with_string, - silc_rc6_encrypt_cbc, silc_rc6_decrypt_cbc, - silc_rc6_context_len }, { "cast-256-cbc", 16, 256, silc_cast_set_key, silc_cast_set_key_with_string, - silc_cast_encrypt_cbc, silc_cast_decrypt_cbc, + silc_cast_encrypt_cbc, silc_cast_decrypt_cbc, silc_cast_context_len }, { "cast-192-cbc", 16, 192, silc_cast_set_key, silc_cast_set_key_with_string, - silc_cast_encrypt_cbc, silc_cast_decrypt_cbc, + silc_cast_encrypt_cbc, silc_cast_decrypt_cbc, silc_cast_context_len }, { "cast-128-cbc", 16, 128, silc_cast_set_key, silc_cast_set_key_with_string, - silc_cast_encrypt_cbc, silc_cast_decrypt_cbc, + silc_cast_encrypt_cbc, silc_cast_decrypt_cbc, silc_cast_context_len }, +#ifdef SILC_DEBUG { "none", 0, 0, silc_none_set_key, silc_none_set_key_with_string, - silc_none_encrypt_cbc, silc_none_decrypt_cbc, + silc_none_encrypt_cbc, silc_none_decrypt_cbc, silc_none_context_len }, +#endif /* SILC_DEBUG */ { NULL, 0, 0, NULL, NULL, NULL, NULL, NULL } }; @@ -88,7 +80,7 @@ const SilcCipherObject silc_default_ciphers[] = registered. Therefore, if memory has been allocated for the object sent as argument it has to be free'd after this function returns succesfully. */ -bool silc_cipher_register(const SilcCipherObject *cipher) +SilcBool silc_cipher_register(const SilcCipherObject *cipher) { #ifndef SILC_EPOC SilcCipherObject *new; @@ -126,7 +118,7 @@ bool silc_cipher_register(const SilcCipherObject *cipher) /* Unregister a cipher from the SILC. */ -bool silc_cipher_unregister(SilcCipherObject *cipher) +SilcBool silc_cipher_unregister(SilcCipherObject *cipher) { #ifndef SILC_EPOC SilcCipherObject *entry; @@ -156,11 +148,11 @@ bool silc_cipher_unregister(SilcCipherObject *cipher) return FALSE; } -/* Function that registers all the default ciphers (all builtin ciphers). +/* Function that registers all the default ciphers (all builtin ciphers). The application may use this to register the default ciphers if specific ciphers in any specific order is not wanted. */ -bool silc_cipher_register_default(void) +SilcBool silc_cipher_register_default(void) { #ifndef SILC_EPOC int i; @@ -172,7 +164,7 @@ bool silc_cipher_register_default(void) return TRUE; } -bool silc_cipher_unregister_all(void) +SilcBool silc_cipher_unregister_all(void) { #ifndef SILC_EPOC SilcCipherObject *entry; @@ -190,17 +182,17 @@ bool silc_cipher_unregister_all(void) return TRUE; } -/* Allocates a new SILC cipher object. Function returns 1 on succes and 0 +/* Allocates a new SILC cipher object. Function returns 1 on succes and 0 on error. The allocated cipher is returned in new_cipher argument. The caller must set the key to the cipher after this function has returned by calling the ciphers set_key function. */ -bool silc_cipher_alloc(const unsigned char *name, SilcCipher *new_cipher) +SilcBool silc_cipher_alloc(const unsigned char *name, SilcCipher *new_cipher) { SilcCipherObject *entry = NULL; SILC_LOG_DEBUG(("Allocating new cipher object")); - + #ifndef SILC_EPOC if (silc_cipher_list) { silc_dlist_start(silc_cipher_list); @@ -224,7 +216,7 @@ bool silc_cipher_alloc(const unsigned char *name, SilcCipher *new_cipher) if (entry) { *new_cipher = silc_calloc(1, sizeof(**new_cipher)); - (*new_cipher)->cipher = entry; + (*new_cipher)->cipher = entry; (*new_cipher)->context = silc_calloc(1, entry->context_len()); return TRUE; } @@ -244,7 +236,7 @@ void silc_cipher_free(SilcCipher cipher) /* Returns TRUE if cipher `name' is supported. */ -bool silc_cipher_is_supported(const unsigned char *name) +SilcBool silc_cipher_is_supported(const unsigned char *name) { #ifndef SILC_EPOC SilcCipherObject *entry; @@ -281,8 +273,8 @@ char *silc_cipher_get_supported(void) while ((entry = silc_dlist_get(silc_cipher_list)) != SILC_LIST_END) { len += strlen(entry->name); list = silc_realloc(list, len + 1); - - memcpy(list + (len - strlen(entry->name)), + + memcpy(list + (len - strlen(entry->name)), entry->name, strlen(entry->name)); memcpy(list + len, ",", 1); len++; @@ -295,8 +287,8 @@ char *silc_cipher_get_supported(void) entry = (SilcCipherObject *)&(silc_default_ciphers[i]); len += strlen(entry->name); list = silc_realloc(list, len + 1); - - memcpy(list + (len - strlen(entry->name)), + + memcpy(list + (len - strlen(entry->name)), entry->name, strlen(entry->name)); memcpy(list + len, ",", 1); len++; @@ -311,25 +303,37 @@ char *silc_cipher_get_supported(void) /* Encrypts */ -bool silc_cipher_encrypt(SilcCipher cipher, const unsigned char *src, - unsigned char *dst, SilcUInt32 len, +SilcBool silc_cipher_encrypt(SilcCipher cipher, const unsigned char *src, + unsigned char *dst, SilcUInt32 len, unsigned char *iv) { - return cipher->cipher->encrypt(cipher->context, src, dst, len, iv); +#ifdef SILC_DEBUG + assert((len & (cipher->cipher->block_len - 1)) == 0); +#endif + if (len & (cipher->cipher->block_len - 1)) + return FALSE; + return cipher->cipher->encrypt(cipher->context, src, dst, len, + iv ? iv : cipher->iv); } /* Decrypts */ -bool silc_cipher_decrypt(SilcCipher cipher, const unsigned char *src, - unsigned char *dst, SilcUInt32 len, +SilcBool silc_cipher_decrypt(SilcCipher cipher, const unsigned char *src, + unsigned char *dst, SilcUInt32 len, unsigned char *iv) { - return cipher->cipher->decrypt(cipher->context, src, dst, len, iv); +#ifdef SILC_DEBUG + /* assert((len & (cipher->cipher->block_len - 1)) == 0); */ +#endif + if (len & (cipher->cipher->block_len - 1)) + return FALSE; + return cipher->cipher->decrypt(cipher->context, src, dst, len, + iv ? iv : cipher->iv); } /* Sets the key for the cipher */ -bool silc_cipher_set_key(SilcCipher cipher, const unsigned char *key, +SilcBool silc_cipher_set_key(SilcCipher cipher, const unsigned char *key, SilcUInt32 keylen) { return cipher->cipher->set_key(cipher->context, key, keylen);