Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Wim Lewis
nettle
Commits
62e58289
Commit
62e58289
authored
Feb 06, 2014
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Deleted _NETTLE_CIPHER_FIX.
parent
a495057f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
15 deletions
+13
-15
ChangeLog
ChangeLog
+5
-2
cast128-meta.c
cast128-meta.c
+8
-2
nettle-meta.h
nettle-meta.h
+0
-11
No files found.
ChangeLog
View file @
62e58289
2014-02-06 Niels Möller <nisse@lysator.liu.se>
* nettle-meta.h (_NETTLE_CIPHER_SEP, _NETTLE_CIPHER_SEP_SET_KEY):
Deleted unused macros.
* 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.
...
...
cast128-meta.c
View file @
62e58289
...
...
@@ -28,5 +28,11 @@
#include "cast128.h"
const
struct
nettle_cipher
nettle_cast128
=
_NETTLE_CIPHER_FIX
(
cast128
,
CAST128
);
const
struct
nettle_cipher
nettle_cast128
=
{
"cast128"
,
sizeof
(
struct
cast128_ctx
),
CAST128_BLOCK_SIZE
,
CAST128_KEY_SIZE
,
(
nettle_set_key_func
*
)
cast128_set_key
,
(
nettle_set_key_func
*
)
cast128_set_key
,
(
nettle_crypt_func
*
)
cast128_encrypt
,
(
nettle_crypt_func
*
)
cast128_decrypt
};
nettle-meta.h
View file @
62e58289
...
...
@@ -63,17 +63,6 @@ struct nettle_cipher
(nettle_crypt_func *) name##_decrypt, \
}
#define _NETTLE_CIPHER_FIX(name, NAME) { \
#name, \
sizeof(struct name##_ctx), \
NAME##_BLOCK_SIZE, \
NAME##_KEY_SIZE, \
(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
Markdown
is supported
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