aboutsummaryrefslogtreecommitdiffstats
path: root/ssl/s23_pkt.c
diff options
context:
space:
mode:
Diffstat (limited to 'ssl/s23_pkt.c')
-rw-r--r--ssl/s23_pkt.c96
1 files changed, 46 insertions, 50 deletions
diff --git a/ssl/s23_pkt.c b/ssl/s23_pkt.c
index 4ca6a1b25845..efc8647841bf 100644
--- a/ssl/s23_pkt.c
+++ b/ssl/s23_pkt.c
@@ -5,21 +5,21 @@
* This package is an SSL implementation written
* by Eric Young (eay@cryptsoft.com).
* The implementation was written so as to conform with Netscapes SSL.
- *
+ *
* This library is free for commercial and non-commercial use as long as
* the following conditions are aheared to. The following conditions
* apply to all code found in this distribution, be it the RC4, RSA,
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
* included with this distribution is covered by the same copyright terms
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
+ *
* Copyright remains Eric Young's, and as such any Copyright notices in
* the code are not to be removed.
* If this package is used in a product, Eric Young should be given attribution
* as the author of the parts of the library used.
* This can be in the form of a textual message at program startup or
* in documentation (online or textual) provided with the package.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -34,10 +34,10 @@
* Eric Young (eay@cryptsoft.com)"
* The word 'cryptographic' can be left out if the rouines from the library
* being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
+ * 4. If you include any Windows specific code (or a derivative thereof) from
* the apps directory (application code) you must include an acknowledgement:
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
+ *
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
+ *
* The licence and distribution terms for any publically available version or
* derivative of this code cannot be changed. i.e. this code cannot simply be
* copied and put under another distribution licence
@@ -64,54 +64,50 @@
#include <openssl/buffer.h>
int ssl23_write_bytes(SSL *s)
- {
- int i,num,tot;
- char *buf;
+{
+ int i, num, tot;
+ char *buf;
- buf=s->init_buf->data;
- tot=s->init_off;
- num=s->init_num;
- for (;;)
- {
- s->rwstate=SSL_WRITING;
- i=BIO_write(s->wbio,&(buf[tot]),num);
- if (i <= 0)
- {
- s->init_off=tot;
- s->init_num=num;
- return(i);
- }
- s->rwstate=SSL_NOTHING;
- if (i == num) return(tot+i);
+ buf = s->init_buf->data;
+ tot = s->init_off;
+ num = s->init_num;
+ for (;;) {
+ s->rwstate = SSL_WRITING;
+ i = BIO_write(s->wbio, &(buf[tot]), num);
+ if (i <= 0) {
+ s->init_off = tot;
+ s->init_num = num;
+ return (i);
+ }
+ s->rwstate = SSL_NOTHING;
+ if (i == num)
+ return (tot + i);
- num-=i;
- tot+=i;
- }
- }
+ num -= i;
+ tot += i;
+ }
+}
/* return regularly only when we have read (at least) 'n' bytes */
int ssl23_read_bytes(SSL *s, int n)
- {
- unsigned char *p;
- int j;
-
- if (s->packet_length < (unsigned int)n)
- {
- p=s->packet;
+{
+ unsigned char *p;
+ int j;
- for (;;)
- {
- s->rwstate=SSL_READING;
- j=BIO_read(s->rbio,(char *)&(p[s->packet_length]),
- n-s->packet_length);
- if (j <= 0)
- return(j);
- s->rwstate=SSL_NOTHING;
- s->packet_length+=j;
- if (s->packet_length >= (unsigned int)n)
- return(s->packet_length);
- }
- }
- return(n);
- }
+ if (s->packet_length < (unsigned int)n) {
+ p = s->packet;
+ for (;;) {
+ s->rwstate = SSL_READING;
+ j = BIO_read(s->rbio, (char *)&(p[s->packet_length]),
+ n - s->packet_length);
+ if (j <= 0)
+ return (j);
+ s->rwstate = SSL_NOTHING;
+ s->packet_length += j;
+ if (s->packet_length >= (unsigned int)n)
+ return (s->packet_length);
+ }
+ }
+ return (n);
+}