summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2016-12-26 15:28:42 +0000
committerjsing <>2016-12-26 15:28:42 +0000
commit3f47f43d5cb4924f08a830e3de5523ac054f9213 (patch)
tree7299eded603ea98b561421ef9ffda6d226858f80 /src
parentd8c64421db0ae603148c027884d5b60879594535 (diff)
downloadopenbsd-3f47f43d5cb4924f08a830e3de5523ac054f9213.tar.gz
openbsd-3f47f43d5cb4924f08a830e3de5523ac054f9213.tar.bz2
openbsd-3f47f43d5cb4924f08a830e3de5523ac054f9213.zip
Restore previous behaviour of incrementing the pointer so that it points
at the end of the buffer. Issue identified by and diff from Kazuki Yamaguchi <k at rhe.jp>.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/ssl_asn1.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_asn1.c b/src/lib/libssl/ssl_asn1.c
index a27858c955..36fbbbed98 100644
--- a/src/lib/libssl/ssl_asn1.c
+++ b/src/lib/libssl/ssl_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_asn1.c,v 1.45 2016/12/07 13:17:33 jsing Exp $ */ 1/* $OpenBSD: ssl_asn1.c,v 1.46 2016/12/26 15:28:42 jsing Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2016 Joel Sing <jsing@openbsd.org> 4 * Copyright (c) 2016 Joel Sing <jsing@openbsd.org>
@@ -200,6 +200,7 @@ i2d_SSL_SESSION(SSL_SESSION *s, unsigned char **pp)
200 data = NULL; 200 data = NULL;
201 } else { 201 } else {
202 memcpy(*pp, data, data_len); 202 memcpy(*pp, data, data_len);
203 *pp += data_len;
203 } 204 }
204 } 205 }
205 206