diff options
author | Niels Möller <nisse@lysator.liu.se> | 2014-01-29 15:13:54 +0100 |
---|---|---|
committer | Niels Möller <nisse@lysator.liu.se> | 2014-01-29 15:13:54 +0100 |
commit | 587855374c50562acf598660e173e76c6e3195bb (patch) | |
tree | 2a8169192ca0c6df7cdbf230094f497680996a67 /serpent-meta.c | |
parent | f508b1fe613f06c571bdc1997cd006f95874d4cb (diff) | |
download | nettle-587855374c50562acf598660e173e76c6e3195bb.tar.gz |
Dropped length argument from nettle_set_key_func.set_key-changes
Diffstat (limited to 'serpent-meta.c')
-rw-r--r-- | serpent-meta.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/serpent-meta.c b/serpent-meta.c index 9b9bab5b..20504f72 100644 --- a/serpent-meta.c +++ b/serpent-meta.c @@ -2,7 +2,7 @@ /* nettle, low-level cryptographics library * - * Copyright (C) 2002 Niels Möller + * Copyright (C) 2002, 2014 Niels Möller * * The nettle library is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -28,11 +28,20 @@ #include "serpent.h" -const struct nettle_cipher nettle_serpent128 -= _NETTLE_CIPHER(serpent, SERPENT, 128); +#define SERPENT(bits) { \ + "serpent" #bits, \ + sizeof(struct serpent_ctx), \ + SERPENT_BLOCK_SIZE, \ + SERPENT ## bits ##_KEY_SIZE, \ + (nettle_set_key_func *) serpent ## bits ## _set_key, \ + (nettle_set_key_func *) serpent ## bits ## _set_key, \ + (nettle_crypt_func *) serpent_encrypt, \ + (nettle_crypt_func *) serpent_decrypt \ +} +const struct nettle_cipher nettle_serpent128 += SERPENT(128); const struct nettle_cipher nettle_serpent192 -= _NETTLE_CIPHER(serpent, SERPENT, 192); - += SERPENT(192); const struct nettle_cipher nettle_serpent256 -= _NETTLE_CIPHER(serpent, SERPENT, 256); += SERPENT(256); |