| commit | e348ff4a729749a9144b99ca880e5cd8348f29d1 | [log] [tgz] |
|---|---|---|
| author | David Benjamin <davidben@chromium.org> | Fri Nov 06 17:55:30 2015 -0500 |
| committer | Adam Langley <agl@google.com> | Fri Nov 06 22:58:14 2015 +0000 |
| tree | c1751681e3c45aa94cc436b24012d74495f00b59 | |
| parent | 6e8076577486a5d3d67682dbc4acae932daa6731 [diff] |
Fix build. There seems to have been a merge error. Change-Id: I72e5c2a45c148e31c90b28bedfff48f8ca6e3c8c Reviewed-on: https://boringssl-review.googlesource.com/6455 Reviewed-by: Adam Langley <agl@google.com>
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 16c24df..c78a91a 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c
@@ -2651,6 +2651,7 @@ } return 1; +} uint8_t SSL_get_server_key_exchange_hash(const SSL *ssl) { return ssl->s3->tmp.server_key_exchange_hash;