diff options
author | Richard Levitte <levitte@openssl.org> | 2002-12-02 06:01:52 +0300 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2002-12-02 06:01:52 +0300 |
commit | 22b3a95d5c2cda53ff5fe378008f6084d30545ec (patch) | |
tree | 7065b45adc0a5b8842253b9d171304c5a33829e0 /ssl | |
parent | 63e86149c159eb604a41e4d6683a1d206271404a (diff) |
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 7a89993b48..6b414cfa5c 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 d6704852b4..3de9663e51 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) |