Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nettle
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
5
Merge Requests
5
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Nettle
nettle
Commits
a66c79ac
Commit
a66c79ac
authored
Feb 06, 2014
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
New function blowfish128_set_key.
parent
62e58289
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
3 deletions
+18
-3
ChangeLog
ChangeLog
+3
-0
blowfish.c
blowfish.c
+7
-0
blowfish.h
blowfish.h
+8
-3
No files found.
ChangeLog
View file @
a66c79ac
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.
...
...
blowfish.c
View file @
a66c79ac
...
...
@@ -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
);
}
blowfish.h
View file @
a66c79ac
...
...
@@ -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
,
...
...
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