diff options
| author | Kenny Root <kroot@google.com> | 2015-11-06 23:39:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-06 23:39:13 +0000 |
| commit | cf79b9c51a06c935943059d7800e3f15c0e6cb10 (patch) | |
| tree | 37655d933cb72bcd7553af526581d3e24e051d7d /src/ssl/d1_both.c | |
| parent | 47e0ae95b75c3d1c435f16ccd959638015c6d9b9 (diff) | |
| parent | e99801b603dea8893dcc61c70b327ef2d00b652c (diff) | |
| download | external_boringssl-cf79b9c51a06c935943059d7800e3f15c0e6cb10.zip external_boringssl-cf79b9c51a06c935943059d7800e3f15c0e6cb10.tar.gz external_boringssl-cf79b9c51a06c935943059d7800e3f15c0e6cb10.tar.bz2 | |
Revert "Revert "external/boringssl: sync with upstream.""
am: e99801b603
* commit 'e99801b603dea8893dcc61c70b327ef2d00b652c':
Revert "Revert "external/boringssl: sync with upstream.""
Diffstat (limited to 'src/ssl/d1_both.c')
| -rw-r--r-- | src/ssl/d1_both.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ssl/d1_both.c b/src/ssl/d1_both.c index 1acb3ce..4d550e9 100644 --- a/src/ssl/d1_both.c +++ b/src/ssl/d1_both.c @@ -399,7 +399,7 @@ static int dtls1_discard_fragment_body(SSL *s, size_t frag_len) { while (frag_len > 0) { size_t chunk = frag_len < sizeof(discard) ? frag_len : sizeof(discard); int ret = dtls1_read_bytes(s, SSL3_RT_HANDSHAKE, discard, chunk, 0); - if (ret != chunk) { + if (ret != (int) chunk) { return 0; } frag_len -= chunk; @@ -525,7 +525,7 @@ static int dtls1_process_fragment(SSL *s) { /* Read the body of the fragment. */ ret = dtls1_read_bytes(s, SSL3_RT_HANDSHAKE, frag->fragment + frag_off, frag_len, 0); - if (ret != frag_len) { + if (ret != (int) frag_len) { OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR); ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR); return -1; |