diff options
| author | djm <> | 2005-04-29 05:37:34 +0000 |
|---|---|---|
| committer | djm <> | 2005-04-29 05:37:34 +0000 |
| commit | a95585a25ab25668b931a78b7543f707a3354db8 (patch) | |
| tree | f9e9febf7ac0c8f5d6df761fe70fd613aac06203 /src/lib/libcrypto/dh/dh_gen.c | |
| parent | 58c08aa241f168c84ce7cc3052454ea59a44eada (diff) | |
| download | openbsd-a95585a25ab25668b931a78b7543f707a3354db8.tar.gz openbsd-a95585a25ab25668b931a78b7543f707a3354db8.tar.bz2 openbsd-a95585a25ab25668b931a78b7543f707a3354db8.zip | |
import of openssl-0.9.7g; tested on platforms from alpha to zaurus, ok deraadt@
Diffstat (limited to 'src/lib/libcrypto/dh/dh_gen.c')
| -rw-r--r-- | src/lib/libcrypto/dh/dh_gen.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/libcrypto/dh/dh_gen.c b/src/lib/libcrypto/dh/dh_gen.c index 06f78b35ab..23777f5a16 100644 --- a/src/lib/libcrypto/dh/dh_gen.c +++ b/src/lib/libcrypto/dh/dh_gen.c | |||
| @@ -86,6 +86,9 @@ | |||
| 86 | * It's just as OK (and in some sense better) to use a generator of the | 86 | * It's just as OK (and in some sense better) to use a generator of the |
| 87 | * order-q subgroup. | 87 | * order-q subgroup. |
| 88 | */ | 88 | */ |
| 89 | |||
| 90 | #ifndef OPENSSL_FIPS | ||
| 91 | |||
| 89 | DH *DH_generate_parameters(int prime_len, int generator, | 92 | DH *DH_generate_parameters(int prime_len, int generator, |
| 90 | void (*callback)(int,int,void *), void *cb_arg) | 93 | void (*callback)(int,int,void *), void *cb_arg) |
| 91 | { | 94 | { |
| @@ -146,6 +149,7 @@ DH *DH_generate_parameters(int prime_len, int generator, | |||
| 146 | if (callback != NULL) callback(3,0,cb_arg); | 149 | if (callback != NULL) callback(3,0,cb_arg); |
| 147 | ret->p=p; | 150 | ret->p=p; |
| 148 | ret->g=BN_new(); | 151 | ret->g=BN_new(); |
| 152 | if (ret->g == NULL) goto err; | ||
| 149 | if (!BN_set_word(ret->g,g)) goto err; | 153 | if (!BN_set_word(ret->g,g)) goto err; |
| 150 | ok=1; | 154 | ok=1; |
| 151 | err: | 155 | err: |
| @@ -167,3 +171,5 @@ err: | |||
| 167 | } | 171 | } |
| 168 | return(ret); | 172 | return(ret); |
| 169 | } | 173 | } |
| 174 | |||
| 175 | #endif | ||