Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
N
nettle
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marcus Hoffmann
nettle
Commits
cee5299a
Commit
cee5299a
authored
Feb 6, 2014
by
Niels Möller
Browse files
Options
Downloads
Patches
Plain Diff
Deleted _NETTLE_CIPHER.
parent
a66c79ac
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
ChangeLog
+6
-3
6 additions, 3 deletions
ChangeLog
nettle-internal.c
+8
-1
8 additions, 1 deletion
nettle-internal.c
nettle-meta.h
+1
-12
1 addition, 12 deletions
nettle-meta.h
with
15 additions
and
16 deletions
ChangeLog
+
6
−
3
View file @
cee5299a
2014-02-06 Niels Möller <nisse@lysator.liu.se>
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.c (blowfish128_set_key): New function.
* blowfish.h (BLOWFISH128_KEY_SIZE): New constant.
* blowfish.h (BLOWFISH128_KEY_SIZE): New constant.
* cast128-meta.c (nettle_cast128): Deleted only use of
* cast128-meta.c (nettle_cast128): Deleted only use of
_NETTLE_CIPHER_FIX.
_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.
* examples/nettle-benchmark.c (time_cipher): Fixed memset calls.
2014-01-30 Niels Möller <nisse@lysator.liu.se>
2014-01-30 Niels Möller <nisse@lysator.liu.se>
...
...
This diff is collapsed.
Click to expand it.
nettle-internal.c
+
8
−
1
View file @
cee5299a
...
@@ -64,7 +64,14 @@ nettle_des3 = {
...
@@ -64,7 +64,14 @@ nettle_des3 = {
/* NOTE: This is not as nice as one might think, as we pretend
/* NOTE: This is not as nice as one might think, as we pretend
blowfish_set_key has no return value. */
blowfish_set_key has no return value. */
const
struct
nettle_cipher
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. */
/* Sets a fix zero iv. For benchmarking only. */
static
void
static
void
...
...
This diff is collapsed.
Click to expand it.
nettle-meta.h
+
1
−
12
View file @
cee5299a
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
/* nettle, low-level cryptographics library
/* 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
* 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
* it under the terms of the GNU Lesser General Public License as published by
...
@@ -52,17 +52,6 @@ struct nettle_cipher
...
@@ -52,17 +52,6 @@ struct nettle_cipher
nettle_crypt_func
*
decrypt
;
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 */
/* null-terminated list of ciphers implemented by this version of nettle */
extern
const
struct
nettle_cipher
*
const
nettle_ciphers
[];
extern
const
struct
nettle_cipher
*
const
nettle_ciphers
[];
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment