X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccrypt%2Fsilccipher.c;h=378bd73cc1d93d677dd0ec4e737c00903ff4d685;hb=c257b555225193e54d85daf541d29578b3c93882;hp=3517317ec5c352a99eee7bd41417e1d372d8f84e;hpb=d47a87b03b846e2333ef57b2c0d81f1644992964;p=silc.git diff --git a/lib/silccrypt/silccipher.c b/lib/silccrypt/silccipher.c index 3517317e..378bd73c 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 @@ -20,65 +19,55 @@ /* $Id$ */ #include "silcincludes.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; +#endif /* SILC_EPOC */ /* Static list of ciphers for silc_cipher_register_default(). */ -SilcCipherObject silc_default_ciphers[] = +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 }, { "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 }, { NULL, 0, 0, NULL, NULL, NULL, NULL, NULL } @@ -89,8 +78,9 @@ 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) +bool silc_cipher_register(const SilcCipherObject *cipher) { +#ifndef SILC_EPOC SilcCipherObject *new; SILC_LOG_DEBUG(("Registering new cipher `%s'", cipher->name)); @@ -120,6 +110,7 @@ bool silc_cipher_register(SilcCipherObject *cipher) silc_cipher_list = silc_dlist_init(); silc_dlist_add(silc_cipher_list, new); +#endif /* SILC_EPOC */ return TRUE; } @@ -127,6 +118,7 @@ bool silc_cipher_register(SilcCipherObject *cipher) bool silc_cipher_unregister(SilcCipherObject *cipher) { +#ifndef SILC_EPOC SilcCipherObject *entry; SILC_LOG_DEBUG(("Unregistering cipher")); @@ -150,49 +142,82 @@ bool silc_cipher_unregister(SilcCipherObject *cipher) } } +#endif /* SILC_EPOC */ 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) { +#ifndef SILC_EPOC int i; for (i = 0; silc_default_ciphers[i].name; i++) silc_cipher_register(&(silc_default_ciphers[i])); +#endif /* SILC_EPOC */ + return TRUE; +} + +bool 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) { - SilcCipherObject *entry; + SilcCipherObject *entry = NULL; SILC_LOG_DEBUG(("Allocating new cipher object")); - + +#ifndef SILC_EPOC if (silc_cipher_list) { silc_dlist_start(silc_cipher_list); while ((entry = silc_dlist_get(silc_cipher_list)) != SILC_LIST_END) { - if (!strcmp(entry->name, name)) { - *new_cipher = silc_calloc(1, sizeof(**new_cipher)); - (*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; + if (!strcmp(entry->name, name)) + break; + } + } +#else + { + /* On EPOC which don't have globals we check our constant cipher list. */ + int i; + for (i = 0; silc_default_ciphers[i].name; i++) { + if (!strcmp(silc_default_ciphers[i].name, name)) { + entry = (SilcCipherObject *)&(silc_default_ciphers[i]); + break; } } } +#endif /* SILC_EPOC */ + + if (entry) { + *new_cipher = silc_calloc(1, sizeof(**new_cipher)); + (*new_cipher)->cipher = entry; + (*new_cipher)->context = silc_calloc(1, entry->context_len()); + return TRUE; + } return FALSE; } @@ -211,6 +236,7 @@ void silc_cipher_free(SilcCipher cipher) bool silc_cipher_is_supported(const unsigned char *name) { +#ifndef SILC_EPOC SilcCipherObject *entry; if (silc_cipher_list) { @@ -220,7 +246,14 @@ bool silc_cipher_is_supported(const unsigned char *name) return TRUE; } } - +#else + { + int i; + for (i = 0; silc_default_ciphers[i].name; i++) + if (!strcmp(silc_default_ciphers[i].name, name)) + return TRUE; + } +#endif /* SILC_EPOC */ return FALSE; } @@ -230,22 +263,38 @@ char *silc_cipher_get_supported(void) { SilcCipherObject *entry; char *list = NULL; - int len; + int len = 0; - len = 0; +#ifndef SILC_EPOC if (silc_cipher_list) { silc_dlist_start(silc_cipher_list); 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++; } - list[len - 1] = 0; } +#else + { + int i; + for (i = 0; silc_default_ciphers[i].name; i++) { + entry = (SilcCipherObject *)&(silc_default_ciphers[i]); + len += strlen(entry->name); + list = silc_realloc(list, len + 1); + + memcpy(list + (len - strlen(entry->name)), + entry->name, strlen(entry->name)); + memcpy(list + len, ",", 1); + len++; + } + } +#endif /* SILC_EPOC */ + + list[len - 1] = 0; return list; } @@ -253,25 +302,37 @@ char *silc_cipher_get_supported(void) /* Encrypts */ bool silc_cipher_encrypt(SilcCipher cipher, const unsigned char *src, - unsigned char *dst, uint32 len, + 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, uint32 len, + 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, - uint32 keylen) + SilcUInt32 keylen) { return cipher->cipher->set_key(cipher->context, key, keylen); } @@ -284,24 +345,30 @@ 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. */ -uint32 silc_cipher_get_key_len(SilcCipher cipher) +SilcUInt32 silc_cipher_get_key_len(SilcCipher cipher) { return cipher->cipher->key_len; } /* Returns the block size of the cipher. */ -uint32 silc_cipher_get_block_len(SilcCipher cipher) +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; +}