summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortedu <>2016-05-04 01:10:58 +0000
committertedu <>2016-05-04 01:10:58 +0000
commitb22f823601e3febfe38c972c9d3d5416f2169482 (patch)
treecd0aa4ce84311cc2ea63b3a3fa70ce0c8e3ff7dc
parent9483b65e2d98e6435b34c6218358a4104a1b1d2f (diff)
downloadopenbsd-b22f823601e3febfe38c972c9d3d5416f2169482.tar.gz
openbsd-b22f823601e3febfe38c972c9d3d5416f2169482.tar.bz2
openbsd-b22f823601e3febfe38c972c9d3d5416f2169482.zip
this chunk was NOT supposed to be committed. spotted by jsg.
-rw-r--r--src/lib/libssl/src/ssl/s3_pkt.c3
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) {