From: Pekka Riikonen Date: Sat, 7 Dec 2002 16:32:39 +0000 (+0000) Subject: updates. X-Git-Tag: silc.client.0.9.10.2~1 X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=440b3925eff469fd1cad5e332363ae428df784c1;p=silc.git updates. --- diff --git a/apps/irssi/silc.conf b/apps/irssi/silc.conf index 4ee35776..c2bd1c69 100644 --- a/apps/irssi/silc.conf +++ b/apps/irssi/silc.conf @@ -197,7 +197,6 @@ statusbar = { # aes-256-cbc, aes-192-cbc, aes-128-cbc, # twofish-256-cbc, twofish-192-cbc, twofish-128-cbc, # rc6-256-cbc, rc6-192-cbc, rc6-128-cbc, -# mars-256-cbc, mars-192-cbc, mars-128-cbc, # cast-256-cbc, cast-192-cbc and cast-128-cbc # # Available hash functions are (default: sha1): diff --git a/lib/silccrypt/tests/test_mars.c b/lib/silccrypt/tests/test_mars.c deleted file mode 100644 index 78bf2ff9..00000000 --- a/lib/silccrypt/tests/test_mars.c +++ /dev/null @@ -1,56 +0,0 @@ -#include -#include - -#include "mars.h" - -int main() -{ - int i; - unsigned char key[256]; - unsigned char plain[256]; - unsigned char plain2[256]; - unsigned char cipher[256]; - unsigned char iv[256]; - - memset(&key, 0, sizeof(key)); - memset(&plain, 0, sizeof(plain)); - memset(&plain2, 0, sizeof(plain2)); - memset(&cipher, 0, sizeof(cipher)); - memset(&iv, 0, sizeof(iv)); - - fprintf(stderr, "\nKey:\n"); - for (i = 0; i < (sizeof(key) / 2); i += 2) { - fprintf(stderr, "%02x%02x ", key[i], key[i+1]); - } - - fprintf(stderr, "\nSetting key\n"); - silc_mars_init(NULL, key, 128); - - fprintf(stderr, "\nPlaintext:\n"); - for (i = 0; i < (sizeof(plain) / 2); i += 2) { - plain[i] = i; - plain[i+1] = i+1; - fprintf(stderr, "%02x%02x ", plain[i], plain[i+1]); - } - - fprintf(stderr, "\n\nEncrypting\n"); - silc_mars_encrypt_cbc(NULL, plain, cipher, 256, iv); - - fprintf(stderr, "Ciphertext:\n"); - for (i = 0; i < (sizeof(cipher)/2); i += 2) { - fprintf(stderr, "%02x", cipher[i]); - fprintf(stderr, "%02x ", cipher[i+1]); - } - - fprintf(stderr, "\n\nDecrypting\n"); - silc_mars_decrypt_cbc(NULL, cipher, plain2, 256, iv); - - fprintf(stderr, "Decryptedtext:\n"); - for (i = 0; i < (sizeof(plain2)/2); i += 2) { - fprintf(stderr, "%02x", plain2[i]); - fprintf(stderr, "%02x ", plain2[i+1]); - } - fprintf(stderr, "\nDone\n"); - - return 0; -}