X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilccrypt%2Fsilccipher.c;h=2264d5cfc51b8212392aaccaf03f2ebf4c9c2821;hp=27e63395a30f9e27efc0d410235e2984b89b73ff;hb=40f8443d8d3a6577336ee66d18e04d9ac4d956bb;hpb=030955992dd0663ddb907a06fd92af62afb9a015 diff --git a/lib/silccrypt/silccipher.c b/lib/silccrypt/silccipher.c index 27e63395..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,9 +18,16 @@ */ /* $Id$ */ -#include "silcincludes.h" +#include "silc.h" #include "ciphers.h" /* Includes cipher definitions */ +/* The SilcCipher context */ +struct SilcCipherStruct { + SilcCipherObject *cipher; + void *context; + unsigned char iv[SILC_CIPHER_MAX_IV_SIZE]; +}; + #ifndef SILC_EPOC /* Dynamically registered list of ciphers. */ SilcDList silc_cipher_list = NULL; @@ -30,57 +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 }, - { "mars-256-cbc", 16, 256, silc_mars_set_key, silc_mars_set_key_with_string, - silc_mars_encrypt_cbc, silc_mars_decrypt_cbc, - silc_mars_context_len }, - { "mars-192-cbc", 16, 192, silc_mars_set_key, silc_mars_set_key_with_string, - silc_mars_encrypt_cbc, silc_mars_decrypt_cbc, - silc_mars_context_len }, - { "mars-128-cbc", 16, 128, silc_mars_set_key, silc_mars_set_key_with_string, - silc_mars_encrypt_cbc, silc_mars_decrypt_cbc, - silc_mars_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 } }; @@ -90,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(SilcCipherObject *cipher) +SilcBool silc_cipher_register(const SilcCipherObject *cipher) { #ifndef SILC_EPOC SilcCipherObject *new; @@ -128,7 +118,7 @@ bool silc_cipher_register(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; @@ -158,33 +148,51 @@ 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; for (i = 0; silc_default_ciphers[i].name; i++) - silc_cipher_register((SilcCipherObject *)&(silc_default_ciphers[i])); + silc_cipher_register(&(silc_default_ciphers[i])); + +#endif /* SILC_EPOC */ + return TRUE; +} + +SilcBool silc_cipher_unregister_all(void) +{ +#ifndef SILC_EPOC + SilcCipherObject *entry; + + if (!silc_cipher_list) + return FALSE; + silc_dlist_start(silc_cipher_list); + while ((entry = silc_dlist_get(silc_cipher_list)) != SILC_LIST_END) { + silc_cipher_unregister(entry); + if (!silc_cipher_list) + break; + } #endif /* SILC_EPOC */ 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); @@ -208,12 +216,8 @@ 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()); - (*new_cipher)->set_iv = silc_cipher_set_iv; - (*new_cipher)->get_iv = silc_cipher_get_iv; - (*new_cipher)->get_key_len = silc_cipher_get_key_len; - (*new_cipher)->get_block_len = silc_cipher_get_block_len; return TRUE; } @@ -232,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; @@ -269,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++; @@ -283,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++; @@ -299,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); @@ -331,12 +347,11 @@ void silc_cipher_set_iv(SilcCipher cipher, const unsigned char *iv) memcpy(&cipher->iv, iv, cipher->cipher->block_len); } -/* Returns the IV (initial vector) of the cipher. The IV is returned - to 'iv' argument. */ +/* Returns the IV (initial vector) of the cipher. */ -void silc_cipher_get_iv(SilcCipher cipher, unsigned char *iv) +unsigned char *silc_cipher_get_iv(SilcCipher cipher) { - memcpy(iv, &cipher->iv, cipher->cipher->block_len); + return cipher->iv; } /* Returns the key length of the cipher. */ @@ -352,3 +367,10 @@ SilcUInt32 silc_cipher_get_block_len(SilcCipher cipher) { return cipher->cipher->block_len; } + +/* Returns the name of the cipher */ + +const char *silc_cipher_get_name(SilcCipher cipher) +{ + return (const char *)cipher->cipher->name; +}