diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-06-16 16:56:43 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-06-16 16:56:43 +0000 |
| commit | 14748adb096f124d4101578afed8d26da4f15f53 (patch) | |
| tree | d03ebb869552073f10d40b14910c9ab0b6a93af6 /ssl/s3_clnt.c | |
| parent | ff2ab9e6bbca8d9eed37dda647e8a37254ef2107 (diff) | |
Make ssl code consistent with FIPS branch. The new code has no effect
at present because it asserts either noop flags or is inside
OPENSSL_FIPS #ifdef's.
Diffstat (limited to 'ssl/s3_clnt.c')
| -rw-r--r-- | ssl/s3_clnt.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 6ae7a1c182..d583ebcc80 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -130,6 +130,10 @@ #include <openssl/objects.h> #include <openssl/evp.h> #include <openssl/md5.h> +#ifdef OPENSSL_FIPS +#include <openssl/fips.h> +#endif + #ifndef OPENSSL_NO_DH #include <openssl/dh.h> #endif @@ -1418,6 +1422,8 @@ int ssl3_get_key_exchange(SSL *s) q=md_buf; for (num=2; num > 0; num--) { + EVP_MD_CTX_set_flags(&md_ctx, + EVP_MD_CTX_FLAG_NON_FIPS_ALLOW); EVP_DigestInit_ex(&md_ctx,(num == 2) ?s->ctx->md5:s->ctx->sha1, NULL); EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE); |