diff options
| author | jkim <jkim@FreeBSD.org> | 2014-01-22 19:57:11 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-01-22 19:57:11 +0000 |
| commit | a8c44ea5cfb6806cb801d126e1ff9c11bdc9a006 (patch) | |
| tree | 4c8798ce163b45133d4f5fb5c859c7235ff5efea /crypto/openssl/ssl/s3_both.c | |
| parent | cc5aa413b410def9b593403149c8a185bc8008b1 (diff) | |
| download | FreeBSD-src-a8c44ea5cfb6806cb801d126e1ff9c11bdc9a006.zip FreeBSD-src-a8c44ea5cfb6806cb801d126e1ff9c11bdc9a006.tar.gz | |
Merge OpenSSL 1.0.1f.
Approved by: so (delphij), benl (silence)
Diffstat (limited to 'crypto/openssl/ssl/s3_both.c')
| -rw-r--r-- | crypto/openssl/ssl/s3_both.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/s3_both.c b/crypto/openssl/ssl/s3_both.c index ae0ee27..53b9390 100644 --- a/crypto/openssl/ssl/s3_both.c +++ b/crypto/openssl/ssl/s3_both.c @@ -161,6 +161,8 @@ int ssl3_send_finished(SSL *s, int a, int b, const char *sender, int slen) i=s->method->ssl3_enc->final_finish_mac(s, sender,slen,s->s3->tmp.finish_md); + if (i == 0) + return 0; s->s3->tmp.finish_md_len = i; memcpy(p, s->s3->tmp.finish_md, i); p+=i; |
