diff options
| author | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2018-06-19 18:34:33 +0300 |
|---|---|---|
| committer | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2018-06-19 19:29:25 +0300 |
| commit | ca21a24808efa5d562ac91f683504ae0d6dfa69f (patch) | |
| tree | b0088b2bfbe08948d4275e9036e7fdce9adbb8e4 /cipher/serpent.c | |
| parent | b6e6ace324440f564df664e27f8276ef01f76795 (diff) | |
| download | libgcrypt-ca21a24808efa5d562ac91f683504ae0d6dfa69f.tar.gz | |
Pass cipher object pointer to setkey functions
* cipher/cipher.c (cipher_setkey): Pass cipher object pointer to
cipher's setkey function.
* cipher/arcfour.c: Add gcry_cipher_hd_t parameter for setkey
functions and update selftests to pass NULL pointer.
* cipher/blowfish.c: Ditto.
* cipher/camellia-glue.c: Ditto.
* cipher/cast5.c: Ditto.
* cipher/chacha20.c: Ditto.
* cipher/cipher-selftest.c: Ditto.
* cipher/des.c: Ditto.
* cipher/gost28147.c: Ditto.
* cipher/idea.c: Ditto.
* cipher/rfc2268.c: Ditto.
* cipher/rijndael.c: Ditto.
* cipher/salsa20.c: Ditto.
* cipher/seed.c: Ditto.
* cipher/serpent.c: Ditto.
* cipher/twofish.c: Ditto.
* src/cipher-proto.h: Ditto.
--
This allows setkey function to replace bulk cipher operations
with faster alternative.
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
Diffstat (limited to 'cipher/serpent.c')
| -rw-r--r-- | cipher/serpent.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cipher/serpent.c b/cipher/serpent.c index ea4b8edc..0736ad19 100644 --- a/cipher/serpent.c +++ b/cipher/serpent.c @@ -748,13 +748,16 @@ serpent_setkey_internal (serpent_context_t *context, /* Initialize CTX with the key KEY of KEY_LENGTH bytes. */ static gcry_err_code_t serpent_setkey (void *ctx, - const byte *key, unsigned int key_length) + const byte *key, unsigned int key_length, + gcry_cipher_hd_t hd) { serpent_context_t *context = ctx; static const char *serpent_test_ret; static int serpent_init_done; gcry_err_code_t ret = GPG_ERR_NO_ERROR; + (void)hd; + if (! serpent_init_done) { /* Execute a self-test the first time, Serpent is used. */ |