Move ssl3_do_write from s3_pkt.c to s3_both.c.

This commit is contained in:
Bodo Möller 2000-02-21 11:14:40 +00:00
parent 8bd5b7944e
commit e7ecc7d4dd
2 changed files with 20 additions and 20 deletions

View File

@ -65,6 +65,26 @@
#include <openssl/x509.h>
#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;

View File

@ -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 */