diff options
author | levitte <levitte> | 2002-12-02 03:00:33 +0000 |
---|---|---|
committer | levitte <levitte> | 2002-12-02 03:00:33 +0000 |
commit | e539333b09251cc1b2eac1c657cf7713962cc5cf (patch) | |
tree | 8de270d7018eb8295ff7a41e5441b6f45f560000 /ssl | |
parent | d58a48e5d8cf72dfee41d1204f34f5527f289773 (diff) | |
download | openssl-e539333b09251cc1b2eac1c657cf7713962cc5cf.tar.gz |
Recent changes from 0.9.6-stable.
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/s3_srvr.c | 2 | ||||
-rw-r--r-- | ssl/ssltest.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 7a89993b4..6b414cfa5 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -1471,7 +1471,7 @@ static int ssl3_get_client_key_exchange(SSL *s) s->method->ssl3_enc->generate_master_secret(s, s->session->master_key, p,i); - memset(p,0,i); + OPENSSL_cleanse(p,i); } else #endif diff --git a/ssl/ssltest.c b/ssl/ssltest.c index d6704852b..3de9663e5 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -366,7 +366,7 @@ bad: "the test anyway (and\n-d to see what happens), " "or add one of -ssl2, -ssl3, -tls1, -reuse\n" "to avoid protocol mismatch.\n"); - exit(1); + EXIT(1); } if (print_time) |