generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove misleading dead code. Constify. (Coverity ID 142)

Browse Source
This commit is contained in:
Ben Laurie 2008-12-26 17:17:21 +00:00
parent ccf529928f
commit 1457619e13
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/dsa/dsa.h
View File

@ -131,7 +131,7 @@ struct dsa_method
char *app_data; char *app_data;
/* If this is non-NULL, it is used to generate DSA parameters */ /* If this is non-NULL, it is used to generate DSA parameters */
int (*dsa_paramgen)(DSA *dsa, int bits, int (*dsa_paramgen)(DSA *dsa, int bits,
unsigned char *seed, int seed_len, const unsigned char *seed, int seed_len,
int *counter_ret, unsigned long *h_ret, int *counter_ret, unsigned long *h_ret,
BN_GENCB *cb); BN_GENCB *cb);
/* If this is non-NULL, it is used to generate DSA keys */ /* If this is non-NULL, it is used to generate DSA keys */
@ -220,7 +220,7 @@ DSA * DSA_generate_parameters(int bits,
/* New version */ /* New version */
int DSA_generate_parameters_ex(DSA *dsa, int bits, int DSA_generate_parameters_ex(DSA *dsa, int bits,
unsigned char *seed,int seed_len, const unsigned char *seed,int seed_len,
int *counter_ret, unsigned long *h_ret, BN_GENCB *cb); int *counter_ret, unsigned long *h_ret, BN_GENCB *cb);
int DSA_generate_key(DSA *a); int DSA_generate_key(DSA *a);

9
crypto/dsa/dsa_gen.c
View File

@ -82,7 +82,7 @@
#include "dsa_locl.h" #include "dsa_locl.h"
int DSA_generate_parameters_ex(DSA *ret, int bits, int DSA_generate_parameters_ex(DSA *ret, int bits,
unsigned char *seed_in, int seed_len, const unsigned char *seed_in, int seed_len,
int *counter_ret, unsigned long *h_ret, BN_GENCB *cb) int *counter_ret, unsigned long *h_ret, BN_GENCB *cb)
{ {
if(ret->meth->dsa_paramgen) if(ret->meth->dsa_paramgen)
@ -110,7 +110,7 @@ int DSA_generate_parameters_ex(DSA *ret, int bits,
} }
int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits, int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
const EVP_MD *evpmd, unsigned char *seed_in, size_t seed_len, const EVP_MD *evpmd, const unsigned char *seed_in, size_t seed_len,
int *counter_ret, unsigned long *h_ret, BN_GENCB *cb) int *counter_ret, unsigned long *h_ret, BN_GENCB *cb)
{ {
int ok=0; int ok=0;
@ -149,11 +149,7 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
seed_len = qsize; /* App. 2.2 of FIPS PUB 186 allows larger SEED, seed_len = qsize; /* App. 2.2 of FIPS PUB 186 allows larger SEED,
* but our internal buffers are restricted to 160 bits*/ * but our internal buffers are restricted to 160 bits*/
if (seed_in != NULL) if (seed_in != NULL)
{
memcpy(seed, seed_in, seed_len); memcpy(seed, seed_in, seed_len);
/* set seed_in to NULL to avoid it being copied back */
seed_in = NULL;
}
if ((ctx=BN_CTX_new()) == NULL) if ((ctx=BN_CTX_new()) == NULL)
goto err; goto err;
@ -335,7 +331,6 @@ err:
ok=0; ok=0;
goto err; goto err;
} }
if (seed_in != NULL) memcpy(seed_in,seed, qsize);
if (counter_ret != NULL) *counter_ret=counter; if (counter_ret != NULL) *counter_ret=counter;
if (h_ret != NULL) *h_ret=h; if (h_ret != NULL) *h_ret=h;
} }

2
crypto/dsa/dsa_locl.h
View File

@ -55,5 +55,5 @@
#include <openssl/dsa.h> #include <openssl/dsa.h>
int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits, int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
const EVP_MD *evpmd, unsigned char *seed_in, size_t seed_len, const EVP_MD *evpmd, const unsigned char *seed_in, size_t seed_len,
int *counter_ret, unsigned long *h_ret, BN_GENCB *cb); int *counter_ret, unsigned long *h_ret, BN_GENCB *cb);