Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dmitry Baryshkov
nettle
Commits
cee5299a
Commit
cee5299a
authored
Feb 06, 2014
by
Niels Möller
Browse files
Deleted _NETTLE_CIPHER.
parent
a66c79ac
Changes
3
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
cee5299a
2014-02-06 Niels Möller <nisse@lysator.liu.se>
* nettle-meta.h (_NETTLE_CIPHER_SEP, _NETTLE_CIPHER_SEP_SET_KEY)
(_NETTLE_CIPHER_FIX, _NETTLE_CIPHER): Deleted unused macros.
* nettle-internal.c (nettle_blowfish128): Deleted only use of
_NETTLE_CIPHER.
* 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.
* nettle-meta.h (_NETTLE_CIPHER_SEP, _NETTLE_CIPHER_SEP_SET_KEY)
(_NETTLE_CIPHER_FIX): Deleted unused macros.
* examples/nettle-benchmark.c (time_cipher): Fixed memset calls.
2014-01-30 Niels Möller <nisse@lysator.liu.se>
...
...
nettle-internal.c
View file @
cee5299a
...
...
@@ -64,7 +64,14 @@ nettle_des3 = {
/* NOTE: This is not as nice as one might think, as we pretend
blowfish_set_key has no return value. */
const
struct
nettle_cipher
nettle_blowfish128
=
_NETTLE_CIPHER
(
blowfish
,
BLOWFISH
,
128
);
nettle_blowfish128
=
{
"blowfish128"
,
sizeof
(
struct
blowfish_ctx
),
BLOWFISH_BLOCK_SIZE
,
BLOWFISH128_KEY_SIZE
,
(
nettle_set_key_func
*
)
blowfish128_set_key
,
(
nettle_set_key_func
*
)
blowfish128_set_key
,
(
nettle_crypt_func
*
)
blowfish_encrypt
,
(
nettle_crypt_func
*
)
blowfish_decrypt
};
/* Sets a fix zero iv. For benchmarking only. */
static
void
...
...
nettle-meta.h
View file @
cee5299a
...
...
@@ -5,7 +5,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
...
...
@@ -52,17 +52,6 @@ struct nettle_cipher
nettle_crypt_func
*
decrypt
;
};
#define _NETTLE_CIPHER(name, NAME, key_size) { \
#name #key_size, \
sizeof(struct name##_ctx), \
NAME##_BLOCK_SIZE, \
key_size / 8, \
(nettle_set_key_func *) name##_set_key, \
(nettle_set_key_func *) name##_set_key, \
(nettle_crypt_func *) name##_encrypt, \
(nettle_crypt_func *) name##_decrypt, \
}
/* null-terminated list of ciphers implemented by this version of nettle */
extern
const
struct
nettle_cipher
*
const
nettle_ciphers
[];
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment