Commit 4975c494 authored by Niels Möller's avatar Niels Möller

Deleted nettle_cipher nettle_arcfour128.

parent 36a85bdf
2014-03-16 Niels Möller <nisse@lysator.liu.se>
* arcfour-meta.c: Deleted file.
* nettle-meta.h (nettle_arcfour128): Deleted declaration.
* nettle-meta-ciphers.c (nettle_ciphers): Deleted
nettle_arcfour128 from list.
* Makefile.in (nettle_SOURCES): Deleted arcfour-meta.c.
* examples/nettle-openssl.c (nettle_openssl_arcfour128): Deleted.
* testsuite/meta-cipher-test.c: Adjust test for removal of
nettle_arcfour128.
2014-03-15 Niels Möller <nisse@lysator.liu.se>
* examples/nettle-benchmark.c (struct bench_aead_info): New
......
......@@ -72,7 +72,7 @@ nettle_SOURCES = aes-decrypt-internal.c aes-decrypt.c \
aes192-meta.c \
aes256-set-encrypt-key.c aes256-set-decrypt-key.c \
aes256-meta.c \
arcfour.c arcfour-crypt.c arcfour-meta.c \
arcfour.c arcfour-crypt.c \
arctwo.c arctwo-meta.c blowfish.c \
base16-encode.c base16-decode.c base16-meta.c \
base64-encode.c base64-decode.c base64-meta.c \
......
/* arcfour-meta.c */
/* nettle, low-level cryptographics library
*
* Copyright (C) 2002 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
* option) any later version.
*
* The nettle library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the nettle library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02111-1301, USA.
*/
#if HAVE_CONFIG_H
# include "config.h"
#endif
#include "nettle-meta.h"
#include "arcfour.h"
const struct nettle_cipher nettle_arcfour128 =
{ "arcfour128", sizeof(struct arcfour_ctx),
0, ARCFOUR128_KEY_SIZE,
(nettle_set_key_func *) arcfour128_set_key,
(nettle_set_key_func *) arcfour128_set_key,
(nettle_crypt_func *) arcfour_crypt,
(nettle_crypt_func *) arcfour_crypt
};
......@@ -735,7 +735,6 @@ main(int argc, char **argv)
OPENSSL(&nettle_openssl_aes128)
OPENSSL(&nettle_openssl_aes192)
OPENSSL(&nettle_openssl_aes256)
&nettle_arcfour128, OPENSSL(&nettle_openssl_arcfour128)
&nettle_blowfish128, OPENSSL(&nettle_openssl_blowfish128)
&nettle_camellia128, &nettle_camellia192, &nettle_camellia256,
&nettle_cast128, OPENSSL(&nettle_openssl_cast128)
......
......@@ -149,30 +149,6 @@ nettle_openssl_aes256 = {
openssl_aes_encrypt, openssl_aes_decrypt
};
/* Arcfour */
static nettle_set_key_func openssl_arcfour128_set_key;
static void
openssl_arcfour128_set_key(void *ctx, const uint8_t *key)
{
RC4_set_key(ctx, 16, key);
}
static nettle_crypt_func openssl_arcfour_crypt;
static void
openssl_arcfour_crypt(void *ctx, size_t length,
uint8_t *dst, const uint8_t *src)
{
RC4(ctx, length, src, dst);
}
const struct nettle_cipher
nettle_openssl_arcfour128 = {
"openssl arcfour128", sizeof(RC4_KEY),
0, 16,
openssl_arcfour128_set_key, openssl_arcfour128_set_key,
openssl_arcfour_crypt, openssl_arcfour_crypt
};
/* Blowfish */
static nettle_set_key_func openssl_bf128_set_key;
static void
......
......@@ -31,7 +31,6 @@ const struct nettle_cipher * const nettle_ciphers[] = {
&nettle_aes128,
&nettle_aes192,
&nettle_aes256,
&nettle_arcfour128,
&nettle_camellia128,
&nettle_camellia192,
&nettle_camellia256,
......
......@@ -59,8 +59,6 @@ extern const struct nettle_cipher nettle_aes128;
extern const struct nettle_cipher nettle_aes192;
extern const struct nettle_cipher nettle_aes256;
extern const struct nettle_cipher nettle_arcfour128;
extern const struct nettle_cipher nettle_camellia128;
extern const struct nettle_cipher nettle_camellia192;
extern const struct nettle_cipher nettle_camellia256;
......
......@@ -9,7 +9,6 @@ const char* ciphers[] = {
"arctwo64",
"arctwo128",
"arctwo_gutmann128",
"arcfour128",
"camellia128",
"camellia192",
"camellia256",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment