diff options
| author | jsing <> | 2017-01-29 15:31:15 +0000 |
|---|---|---|
| committer | jsing <> | 2017-01-29 15:31:15 +0000 |
| commit | f8c627888330b75c2eea8a3c27d0efe947a4f9da (patch) | |
| tree | 98f1154e26ef2d1f956e48e50c7deeb5995960aa /src/lib/libssl/ssl_pkt.c | |
| parent | 6b6ab37138277705113e3d34b9354c9c9bd5e9c5 (diff) | |
| download | openbsd-f8c627888330b75c2eea8a3c27d0efe947a4f9da.tar.gz openbsd-f8c627888330b75c2eea8a3c27d0efe947a4f9da.tar.bz2 openbsd-f8c627888330b75c2eea8a3c27d0efe947a4f9da.zip | |
Put comment back in the right place.
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_pkt.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libssl/ssl_pkt.c b/src/lib/libssl/ssl_pkt.c index 38d011fdc3..6a1c837944 100644 --- a/src/lib/libssl/ssl_pkt.c +++ b/src/lib/libssl/ssl_pkt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_pkt.c,v 1.7 2017/01/26 12:16:13 beck Exp $ */ | 1 | /* $OpenBSD: ssl_pkt.c,v 1.8 2017/01/29 15:31:15 jsing 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 | * |
| @@ -123,14 +123,6 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, | |||
| 123 | unsigned int len, int create_empty_fragment); | 123 | unsigned int len, int create_empty_fragment); |
| 124 | static int ssl3_get_record(SSL *s); | 124 | static int ssl3_get_record(SSL *s); |
| 125 | 125 | ||
| 126 | /* If extend == 0, obtain new n-byte packet; if extend == 1, increase | ||
| 127 | * packet by another n bytes. | ||
| 128 | * The packet will be in the sub-array of s->s3->rbuf.buf specified | ||
| 129 | * by s->internal->packet and s->internal->packet_length. | ||
| 130 | * (If s->internal->read_ahead is set, 'max' bytes may be stored in rbuf | ||
| 131 | * [plus s->internal->packet_length bytes if extend == 1].) | ||
| 132 | */ | ||
| 133 | |||
| 134 | /* | 126 | /* |
| 135 | * Force a WANT_READ return for certain error conditions where | 127 | * Force a WANT_READ return for certain error conditions where |
| 136 | * we don't want to spin internally. | 128 | * we don't want to spin internally. |
| @@ -146,6 +138,14 @@ ssl_force_want_read(SSL *s) | |||
| 146 | s->internal->rwstate = SSL_READING; | 138 | s->internal->rwstate = SSL_READING; |
| 147 | } | 139 | } |
| 148 | 140 | ||
| 141 | /* | ||
| 142 | * If extend == 0, obtain new n-byte packet; if extend == 1, increase | ||
| 143 | * packet by another n bytes. | ||
| 144 | * The packet will be in the sub-array of s->s3->rbuf.buf specified | ||
| 145 | * by s->internal->packet and s->internal->packet_length. | ||
| 146 | * (If s->internal->read_ahead is set, 'max' bytes may be stored in rbuf | ||
| 147 | * [plus s->internal->packet_length bytes if extend == 1].) | ||
| 148 | */ | ||
| 149 | static int | 149 | static int |
| 150 | ssl3_read_n(SSL *s, int n, int max, int extend) | 150 | ssl3_read_n(SSL *s, int n, int max, int extend) |
| 151 | { | 151 | { |
