diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | blowfish.c | 7 | ||||
-rw-r--r-- | blowfish.h | 11 |
3 files changed, 18 insertions, 3 deletions
@@ -1,5 +1,8 @@ 2014-02-06 Niels Möller <nisse@lysator.liu.se> + * blowfish.c (blowfish128_set_key): New function. + * blowfish.h (BLOWFISH128_KEY_SIZE): New constant. + * cast128-meta.c (nettle_cast128): Deleted only use of _NETTLE_CIPHER_FIX. @@ -9,6 +9,7 @@ /* nettle, low-level cryptographics library * + * Copyright (C) 2014 Niels Möller * Copyright (C) 2010 Simon Josefsson * Copyright (C) 1998, 2001, 2002, 2003 Free Software Foundation, Inc. * @@ -412,3 +413,9 @@ blowfish_set_key (struct blowfish_ctx *ctx, return 1; } + +int +blowfish128_set_key(struct blowfish_ctx *ctx, const uint8_t *key) +{ + return blowfish_set_key (ctx, BLOWFISH128_KEY_SIZE, key); +} @@ -5,8 +5,9 @@ /* nettle, low-level cryptographics library * + * Copyright (C) 2014 Niels Möller * Copyright (C) 1998, 2001 FSF, Ray Dassen, 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 * the Free Software Foundation; either version 2.1 of the License, or (at your @@ -34,6 +35,7 @@ extern "C" { /* Name mangling */ #define blowfish_set_key nettle_blowfish_set_key +#define blowfish128_set_key nettle_blowfish128_set_key #define blowfish_encrypt nettle_blowfish_encrypt #define blowfish_decrypt nettle_blowfish_decrypt @@ -46,6 +48,8 @@ extern "C" { /* Default to 128 bits */ #define BLOWFISH_KEY_SIZE 16 +#define BLOWFISH128_KEY_SIZE 16 + #define _BLOWFISH_ROUNDS 16 struct blowfish_ctx @@ -54,11 +58,12 @@ struct blowfish_ctx uint32_t p[_BLOWFISH_ROUNDS+2]; }; -/* On success, returns 1 and sets ctx->status to BLOWFISH_OK (zero). - * On error, returns 0 and sets ctx->status to BLOWFISH_WEAK_KEY. */ +/* Returns 0 for weak keys, otherwise 1. */ int blowfish_set_key(struct blowfish_ctx *ctx, size_t length, const uint8_t *key); +int +blowfish128_set_key(struct blowfish_ctx *ctx, const uint8_t *key); void blowfish_encrypt(const struct blowfish_ctx *ctx, |