From e7ecc7d4ddcfc5d2a09dde220e3fc0b5e4b46289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bodo=20M=C3=B6ller?= Date: Mon, 21 Feb 2000 11:14:40 +0000 Subject: [PATCH] Move ssl3_do_write from s3_pkt.c to s3_both.c. --- ssl/s3_both.c | 20 ++++++++++++++++++++ ssl/s3_pkt.c | 20 -------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ssl/s3_both.c b/ssl/s3_both.c index 7efe2dc792..f1a9282f0e 100644 --- a/ssl/s3_both.c +++ b/ssl/s3_both.c @@ -65,6 +65,26 @@ #include #include "ssl_locl.h" +/* send s->init_buf in records of type 'type' */ +int ssl3_do_write(SSL *s, int type) + { + int ret; + + ret=ssl3_write_bytes(s,type,&s->init_buf->data[s->init_off], + s->init_num); + if (ret < 0) return(-1); + if (type == SSL3_RT_HANDSHAKE) + /* should not be done for 'Hello Request's, but in that case + * we'll ignore the result anyway */ + ssl3_finish_mac(s,&s->init_buf->data[s->init_off],ret); + + if (ret == s->init_num) + return(1); + s->init_off+=ret; + s->init_num-=ret; + return(0); + } + int ssl3_send_finished(SSL *s, int a, int b, const char *sender, int slen) { unsigned char *p,*d; diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index d76c5f9e59..e95dcd9461 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -1117,26 +1117,6 @@ static int do_change_cipher_spec(SSL *s) return(1); } -/* send s->init_buf in records of type 'type' */ -int ssl3_do_write(SSL *s, int type) - { - int ret; - - ret=ssl3_write_bytes(s,type,&s->init_buf->data[s->init_off], - s->init_num); - if (ret < 0) return(-1); - if (type == SSL3_RT_HANDSHAKE) - /* should not be done for 'Hello Request's, but in that case - * we'll ignore the result anyway */ - ssl3_finish_mac(s,&s->init_buf->data[s->init_off],ret); - - if (ret == s->init_num) - return(1); - s->init_off+=ret; - s->init_num-=ret; - return(0); - } - void ssl3_send_alert(SSL *s, int level, int desc) { /* Map tls/ssl alert value to correct one */