projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update DTLS code to match CBC decoding in TLS.
[oweals/openssl.git]
/
crypto
/
dsa
/
dsa_gen.c
diff --git
a/crypto/dsa/dsa_gen.c
b/crypto/dsa/dsa_gen.c
index dffd588ff1c441b79f8ba61775566a7b02ab026d..7a9d1881cc481eddd44b1fa13f9f608570f460f4 100644
(file)
--- a/
crypto/dsa/dsa_gen.c
+++ b/
crypto/dsa/dsa_gen.c
@@
-82,6
+82,8
@@
#include <openssl/rand.h>
#include <openssl/sha.h>
#include <openssl/rand.h>
#include <openssl/sha.h>
+#ifndef OPENSSL_FIPS
+
static int dsa_builtin_paramgen(DSA *ret, int bits,
unsigned char *seed_in, int seed_len,
int *counter_ret, unsigned long *h_ret, BN_GENCB *cb);
static int dsa_builtin_paramgen(DSA *ret, int bits,
unsigned char *seed_in, int seed_len,
int *counter_ret, unsigned long *h_ret, BN_GENCB *cb);
@@
-108,40
+110,46
@@
static int dsa_builtin_paramgen(DSA *ret, int bits,
BIGNUM *r0,*W,*X,*c,*test;
BIGNUM *g=NULL,*q=NULL,*p=NULL;
BN_MONT_CTX *mont=NULL;
BIGNUM *r0,*W,*X,*c,*test;
BIGNUM *g=NULL,*q=NULL,*p=NULL;
BN_MONT_CTX *mont=NULL;
- int k,n=0,i,
b,
m=0;
+ int k,n=0,i,m=0;
int counter=0;
int r=0;
int counter=0;
int r=0;
- BN_CTX *ctx=NULL
,*ctx2=NULL,*ctx3=NULL
;
+ BN_CTX *ctx=NULL;
unsigned int h=2;
if (bits < 512) bits=512;
bits=(bits+63)/64*64;
unsigned int h=2;
if (bits < 512) bits=512;
bits=(bits+63)/64*64;
- if (seed_len < 20)
+ /* NB: seed_len == 0 is special case: copy generated seed to
+ * seed_in if it is not NULL.
+ */
+ if (seed_len && (seed_len < 20))
seed_in = NULL; /* seed buffer too small -- ignore */
if (seed_len > 20)
seed_len = 20; /* App. 2.2 of FIPS PUB 186 allows larger SEED,
* but our internal buffers are restricted to 160 bits*/
if ((seed_in != NULL) && (seed_len == 20))
seed_in = NULL; /* seed buffer too small -- ignore */
if (seed_len > 20)
seed_len = 20; /* App. 2.2 of FIPS PUB 186 allows larger SEED,
* but our internal buffers are restricted to 160 bits*/
if ((seed_in != NULL) && (seed_len == 20))
+ {
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) goto err;
if ((ctx=BN_CTX_new()) == NULL) goto err;
- if ((ctx2=BN_CTX_new()) == NULL) goto err;
- if ((ctx3=BN_CTX_new()) == NULL) goto err;
if ((mont=BN_MONT_CTX_new()) == NULL) goto err;
if ((mont=BN_MONT_CTX_new()) == NULL) goto err;
- BN_CTX_start(ctx2);
- r0 = BN_CTX_get(ctx2);
- g = BN_CTX_get(ctx2);
- W = BN_CTX_get(ctx2);
- q = BN_CTX_get(ctx2);
- X = BN_CTX_get(ctx2);
- c = BN_CTX_get(ctx2);
- p = BN_CTX_get(ctx2);
- test = BN_CTX_get(ctx2);
-
- BN_lshift(test,BN_value_one(),bits-1);
+ BN_CTX_start(ctx);
+ r0 = BN_CTX_get(ctx);
+ g = BN_CTX_get(ctx);
+ W = BN_CTX_get(ctx);
+ q = BN_CTX_get(ctx);
+ X = BN_CTX_get(ctx);
+ c = BN_CTX_get(ctx);
+ p = BN_CTX_get(ctx);
+ test = BN_CTX_get(ctx);
+
+ if (!BN_lshift(test,BN_value_one(),bits-1))
+ goto err;
for (;;)
{
for (;;)
{
@@
-184,7
+192,7
@@
static int dsa_builtin_paramgen(DSA *ret, int bits,
if (!BN_bin2bn(md,SHA_DIGEST_LENGTH,q)) goto err;
/* step 4 */
if (!BN_bin2bn(md,SHA_DIGEST_LENGTH,q)) goto err;
/* step 4 */
- r = BN_is_prime_fasttest_ex(q, DSS_prime_checks, ctx
3
,
+ r = BN_is_prime_fasttest_ex(q, DSS_prime_checks, ctx,
seed_is_random, cb);
if (r > 0)
break;
seed_is_random, cb);
if (r > 0)
break;
@@
-203,7
+211,6
@@
static int dsa_builtin_paramgen(DSA *ret, int bits,
/* "offset = 2" */
n=(bits-1)/160;
/* "offset = 2" */
n=(bits-1)/160;
- b=(bits-1)-n*160;
for (;;)
{
for (;;)
{
@@
-227,27
+234,27
@@
static int dsa_builtin_paramgen(DSA *ret, int bits,
/* step 8 */
if (!BN_bin2bn(md,SHA_DIGEST_LENGTH,r0))
goto err;
/* step 8 */
if (!BN_bin2bn(md,SHA_DIGEST_LENGTH,r0))
goto err;
-
BN_lshift(r0,r0,160*k)
;
-
BN_add(W,W,r0)
;
+
if (!BN_lshift(r0,r0,160*k)) goto err
;
+
if (!BN_add(W,W,r0)) goto err
;
}
/* more of step 8 */
}
/* more of step 8 */
-
BN_mask_bits(W,bits-1)
;
- BN_copy(X,W); /* this should be ok */
- BN_add(X,X,test); /* this should be ok */
+
if (!BN_mask_bits(W,bits-1)) goto err
;
+ if (!BN_copy(X,W)) goto err;
+ if (!BN_add(X,X,test)) goto err;
/* step 9 */
/* step 9 */
-
BN_lshift1(r0,q)
;
-
BN_mod(c,X,r0,ctx)
;
-
BN_sub(r0,c,BN_value_one())
;
-
BN_sub(p,X,r0)
;
+
if (!BN_lshift1(r0,q)) goto err
;
+
if (!BN_mod(c,X,r0,ctx)) goto err
;
+
if (!BN_sub(r0,c,BN_value_one())) goto err
;
+
if (!BN_sub(p,X,r0)) goto err
;
/* step 10 */
if (BN_cmp(p,test) >= 0)
{
/* step 11 */
r = BN_is_prime_fasttest_ex(p, DSS_prime_checks,
/* step 10 */
if (BN_cmp(p,test) >= 0)
{
/* step 11 */
r = BN_is_prime_fasttest_ex(p, DSS_prime_checks,
- ctx
3
, 1, cb);
+ ctx, 1, cb);
if (r > 0)
goto end; /* found it */
if (r != 0)
if (r > 0)
goto end; /* found it */
if (r != 0)
@@
-268,18
+275,18
@@
end:
/* We now need to generate g */
/* Set r0=(p-1)/q */
/* We now need to generate g */
/* Set r0=(p-1)/q */
-
BN_sub(test,p,BN_value_one())
;
-
BN_div(r0,NULL,test,q,ctx)
;
+
if (!BN_sub(test,p,BN_value_one())) goto err
;
+
if (!BN_div(r0,NULL,test,q,ctx)) goto err
;
-
BN_set_word(test,h)
;
-
BN_MONT_CTX_set(mont,p,ctx)
;
+
if (!BN_set_word(test,h)) goto err
;
+
if (!BN_MONT_CTX_set(mont,p,ctx)) goto err
;
for (;;)
{
/* g=test^r0%p */
for (;;)
{
/* g=test^r0%p */
-
BN_mod_exp_mont(g,test,r0,p,ctx,mont)
;
+
if (!BN_mod_exp_mont(g,test,r0,p,ctx,mont)) goto err
;
if (!BN_is_one(g)) break;
if (!BN_is_one(g)) break;
-
BN_add(test,test,BN_value_one())
;
+
if (!BN_add(test,test,BN_value_one())) goto err
;
h++;
}
h++;
}
@@
-296,18
+303,22
@@
err:
ret->p=BN_dup(p);
ret->q=BN_dup(q);
ret->g=BN_dup(g);
ret->p=BN_dup(p);
ret->q=BN_dup(q);
ret->g=BN_dup(g);
- if ((m > 1) && (seed_in != NULL)) memcpy(seed_in,seed,20);
+ if (ret->p == NULL || ret->q == NULL || ret->g == NULL)
+ {
+ ok=0;
+ goto err;
+ }
+ if (seed_in != NULL) memcpy(seed_in,seed,20);
if (counter_ret != NULL) *counter_ret=counter;
if (h_ret != NULL) *h_ret=h;
}
if (counter_ret != NULL) *counter_ret=counter;
if (h_ret != NULL) *h_ret=h;
}
- if (ctx != NULL) BN_CTX_free(ctx);
- if (ctx2 != NULL)
+ if(ctx)
{
{
- BN_CTX_end(ctx
2
);
- BN_CTX_free(ctx
2
);
+ BN_CTX_end(ctx);
+ BN_CTX_free(ctx);
}
}
- if (ctx3 != NULL) BN_CTX_free(ctx3);
if (mont != NULL) BN_MONT_CTX_free(mont);
return ok;
}
#endif
if (mont != NULL) BN_MONT_CTX_free(mont);
return ok;
}
#endif
+#endif