diff options
| author | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-03-05 09:29:19 +0100 |
|---|---|---|
| committer | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-03-05 09:29:19 +0100 |
| commit | 365e71f706b40c32173fa06c6feaac48c1527520 (patch) | |
| tree | 54fa72a914d18c9430eaa54f3de4a2d4419198af /src/libtls/tls_reader.c | |
| parent | 5d7669b7b3563c50b3c86903e0a49373d597b8a0 (diff) | |
| parent | 568905f488e63e28778f87ac0e38d845f45bae79 (diff) | |
| download | vyos-strongswan-365e71f706b40c32173fa06c6feaac48c1527520.tar.gz vyos-strongswan-365e71f706b40c32173fa06c6feaac48c1527520.zip | |
Fixed merge, don't know why this didn't happen automatically - maybe a leftover from the svn->git conversion
Diffstat (limited to 'src/libtls/tls_reader.c')
| -rw-r--r-- | src/libtls/tls_reader.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/libtls/tls_reader.c b/src/libtls/tls_reader.c index 17ec68fd5..f13cdc931 100644 --- a/src/libtls/tls_reader.c +++ b/src/libtls/tls_reader.c @@ -52,8 +52,13 @@ METHOD(tls_reader_t, read_uint8, bool, { if (this->buf.len < 1) { +<<<<<<< HEAD DBG1(DBG_TLS, "%d bytes insufficient to parse uint%d TLS data", this->buf.len, 8); +======= + DBG1(DBG_TLS, "%d bytes insufficient to parse u_int8 data", + this->buf.len); +>>>>>>> upstream/4.5.1 return FALSE; } *res = this->buf.ptr[0]; @@ -66,8 +71,13 @@ METHOD(tls_reader_t, read_uint16, bool, { if (this->buf.len < 2) { +<<<<<<< HEAD DBG1(DBG_TLS, "%d bytes insufficient to parse uint%d TLS data", this->buf.len, 16); +======= + DBG1(DBG_TLS, "%d bytes insufficient to parse u_int16 data", + this->buf.len); +>>>>>>> upstream/4.5.1 return FALSE; } *res = untoh16(this->buf.ptr); @@ -80,8 +90,13 @@ METHOD(tls_reader_t, read_uint24, bool, { if (this->buf.len < 3) { +<<<<<<< HEAD DBG1(DBG_TLS, "%d bytes insufficient to parse uint%d TLS data", this->buf.len, 24); +======= + DBG1(DBG_TLS, "%d bytes insufficient to parse u_int24 data", + this->buf.len); +>>>>>>> upstream/4.5.1 return FALSE; } *res = untoh32(this->buf.ptr) >> 8; @@ -94,8 +109,13 @@ METHOD(tls_reader_t, read_uint32, bool, { if (this->buf.len < 4) { +<<<<<<< HEAD DBG1(DBG_TLS, "%d bytes insufficient to parse uint%d TLS data", this->buf.len, 32); +======= + DBG1(DBG_TLS, "%d bytes insufficient to parse u_int32 data", + this->buf.len); +>>>>>>> upstream/4.5.1 return FALSE; } *res = untoh32(this->buf.ptr); @@ -108,7 +128,11 @@ METHOD(tls_reader_t, read_data, bool, { if (this->buf.len < len) { +<<<<<<< HEAD DBG1(DBG_TLS, "%d bytes insufficient to parse %d bytes TLS data", +======= + DBG1(DBG_TLS, "%d bytes insufficient to parse %d bytes of data", +>>>>>>> upstream/4.5.1 this->buf.len, len); return FALSE; } |