diff options
| author | tedu <> | 2016-05-04 01:10:58 +0000 |
|---|---|---|
| committer | tedu <> | 2016-05-04 01:10:58 +0000 |
| commit | f26350026db9784ff4cd43ffe8dfa15a41dcfded (patch) | |
| tree | cd0aa4ce84311cc2ea63b3a3fa70ce0c8e3ff7dc /src/lib | |
| parent | 575021001c555e822c36a5fbb07f185961f6453e (diff) | |
| download | openbsd-f26350026db9784ff4cd43ffe8dfa15a41dcfded.tar.gz openbsd-f26350026db9784ff4cd43ffe8dfa15a41dcfded.tar.bz2 openbsd-f26350026db9784ff4cd43ffe8dfa15a41dcfded.zip | |
this chunk was NOT supposed to be committed. spotted by jsg.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libssl/src/ssl/s3_pkt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/libssl/src/ssl/s3_pkt.c b/src/lib/libssl/src/ssl/s3_pkt.c index 4dd09eeba5..bb36a1a11f 100644 --- a/src/lib/libssl/src/ssl/s3_pkt.c +++ b/src/lib/libssl/src/ssl/s3_pkt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s3_pkt.c,v 1.57.2.1 2016/05/03 12:39:48 tedu Exp $ */ | 1 | /* $OpenBSD: s3_pkt.c,v 1.57.2.2 2016/05/04 01:10:57 tedu Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -956,7 +956,6 @@ start: | |||
| 956 | 956 | ||
| 957 | memcpy(buf, &(rr->data[rr->off]), n); | 957 | memcpy(buf, &(rr->data[rr->off]), n); |
| 958 | if (!peek) { | 958 | if (!peek) { |
| 959 | memset(&(rr->data[rr->off]), 0, n); | ||
| 960 | rr->length -= n; | 959 | rr->length -= n; |
| 961 | rr->off += n; | 960 | rr->off += n; |
| 962 | if (rr->length == 0) { | 961 | if (rr->length == 0) { |
