diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/des.c | 12 | ||||
| -rw-r--r-- | tests/test-des.c | 36 |
3 files changed, 28 insertions, 24 deletions
@@ -1,3 +1,7 @@ +2007-03-13 Simon Josefsson <simon@josefsson.org> + + * tests/test-des.c: Use new namespace. + 2007-03-15 Bruno Haible <bruno@clisp.org> * lib/dummy.c (gl_dummy_symbol): Renamed from 'dummy'. @@ -60,7 +60,7 @@ * .... * * // Set up the DES encryption context - * des_setkey(&context, key); + * gl_des_setkey(&context, key); * * // Encrypt the plaintext * des_ecb_encrypt(&context, plaintext, ciphertext); @@ -541,9 +541,9 @@ gl_des_makekey (gl_des_ctx *ctx, const char * key, size_t keylen) if (keylen != 8) return false; - des_setkey (ctx, key); + gl_des_setkey (ctx, key); - return !des_is_weak_key (key); + return !gl_des_is_weak_key (key); } void @@ -667,7 +667,7 @@ gl_3des_makekey (gl_3des_ctx *ctx, const char * key, size_t keylen) gl_3des_set3keys (ctx, key, key + 8, key + 16); - return !(des_is_weak_key (key) - || des_is_weak_key (key + 8) - || des_is_weak_key (key + 16)); + return !(gl_des_is_weak_key (key) + || gl_des_is_weak_key (key + 8) + || gl_des_is_weak_key (key + 16)); } diff --git a/tests/test-des.c b/tests/test-des.c index 485ee18672..d93a41bcbd 100644 --- a/tests/test-des.c +++ b/tests/test-des.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 Free Software Foundation + * Copyright (C) 2005, 2007 Free Software Foundation * Written by Simon Josefsson * * This program is free software; you can redistribute it and/or modify @@ -40,15 +40,15 @@ main (int argc, char *argv[]) char input[8] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; char result[8] = { 0x24, 0x6e, 0x9d, 0xb9, 0xc5, 0x50, 0x38, 0x1a }; char temp1[8], temp2[8], temp3[8]; - des_ctx des; + gl_des_ctx des; for (i = 0; i < 64; ++i) { - des_setkey (&des, key); - des_ecb_encrypt (&des, input, temp1); - des_ecb_encrypt (&des, temp1, temp2); - des_setkey (&des, temp2); - des_ecb_decrypt (&des, temp1, temp3); + gl_des_setkey (&des, key); + gl_des_ecb_encrypt (&des, input, temp1); + gl_des_ecb_encrypt (&des, temp1, temp2); + gl_des_setkey (&des, temp2); + gl_des_ecb_decrypt (&des, temp1, temp3); memcpy (key, temp3, 8); memcpy (input, temp1, 8); } @@ -67,15 +67,15 @@ main (int argc, char *argv[]) char key2[8] = { 0x11, 0x22, 0x33, 0x44, 0xff, 0xaa, 0xcc, 0xdd }; char result[8] = { 0x7b, 0x38, 0x3b, 0x23, 0xa2, 0x7d, 0x26, 0xd3 }; - tripledes_ctx des3; + gl_3des_ctx des3; for (i = 0; i < 16; ++i) { - tripledes_set2keys (&des3, key1, key2); - tripledes_ecb_encrypt (&des3, input, key1); - tripledes_ecb_decrypt (&des3, input, key2); - tripledes_set3keys (&des3, key1, input, key2); - tripledes_ecb_encrypt (&des3, input, input); + gl_3des_set2keys (&des3, key1, key2); + gl_3des_ecb_encrypt (&des3, input, key1); + gl_3des_ecb_decrypt (&des3, input, key2); + gl_3des_set3keys (&des3, key1, input, key2); + gl_3des_ecb_encrypt (&des3, input, input); } if (memcmp (input, result, 8)) return 1; @@ -196,20 +196,20 @@ main (int argc, char *argv[]) char result[8]; int i; - tripledes_ctx des3; + gl_3des_ctx des3; for (i = 0; i < sizeof (testdata) / sizeof (*testdata); ++i) { - tripledes_set3keys (&des3, testdata[i].key, - testdata[i].key + 8, testdata[i].key + 16); + gl_3des_set3keys (&des3, testdata[i].key, + testdata[i].key + 8, testdata[i].key + 16); - tripledes_ecb_encrypt (&des3, testdata[i].plain, result); + gl_3des_ecb_encrypt (&des3, testdata[i].plain, result); if (memcmp (testdata[i].cipher, result, 8)) { return 1; } - tripledes_ecb_decrypt (&des3, testdata[i].cipher, result); + gl_3des_ecb_decrypt (&des3, testdata[i].cipher, result); if (memcmp (testdata[i].plain, result, 8)) { return 1; |