Commit e0162fa7 authored by Ben Laurie's avatar Ben Laurie
Browse files

Remove unused functions/data.

parent a8e31950

Configure

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ my %table=( 
"debug-ben-openbsd-debug","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",

"debug-ben-debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::::",

"debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown)::::::",

"debug-ben-fips","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DFIPS -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::asm/bn86-elf.o asm/co86-elf.o",

"debug-ben-fips","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -DFIPS -O2 -Wall -Wshadow -Werror -pipe::(unknown)::::asm/bn86-elf.o asm/co86-elf.o",

"debug-ben-fips-debug","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DFIPS -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::asm/bn86-elf.o asm/co86-elf.o",

"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",

"debug-bodo",	"gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DBIO_PAIR_DEBUG -DPEDANTIC -g -m486 -pedantic -Wshadow -Wall::-D_REENTRANT:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",

crypto/engine/hw_cryptodev.c

+6 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static int cryptodev_max_iv(int cipher); 
static int cryptodev_key_length_valid(int cipher, int len);

static int cipher_nid_to_cryptodev(int nid);

static int get_cryptodev_ciphers(const int **cnids);

static int get_cryptodev_digests(const int **cnids);

/*static int get_cryptodev_digests(const int **cnids);*/

static int cryptodev_usable_ciphers(const int **nids);

static int cryptodev_usable_digests(const int **nids);

static int cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
@@ -140,6 +140,7 @@ static struct { 
	{ 0,				NID_undef,		0,	 0, },

};



#if 0 /* UNUSED */

static struct {

	int	id;

	int	nid;
@@ -152,6 +153,7 @@ static struct { 
	{ CRYPTO_SHA1,			NID_undef,		},

	{ 0,				NID_undef,		},

};

#endif



/*

 * Return a fd if /dev/crypto seems usable, 0 otherwise.
@@ -292,6 +294,7 @@ get_cryptodev_ciphers(const int **cnids) 
 * returning them here is harmless, as long as we return NULL

 * when asked for a handler in the cryptodev_engine_digests routine

 */

#if 0 /* UNUSED */

static int

get_cryptodev_digests(const int **cnids)

{
@@ -321,6 +324,7 @@ get_cryptodev_digests(const int **cnids) 
		*cnids = NULL;

	return (count);

}

#endif



/*

 * Find the useable ciphers|digests from dev/crypto - this is the first
@@ -626,7 +630,7 @@ static int 
bn2crparam(const BIGNUM *a, struct crparam *crp)

{

	int i, j, k;

	ssize_t words, bytes, bits;

	ssize_t bytes, bits;

	u_char *b;



	crp->crp_p = NULL;