Merge in code from main trunk to BRANCH_engine.

This commit is contained in:
Richard Levitte
2000-06-08 11:00:37 +00:00
parent 5decfb7002
commit d44c7dcf00
280 changed files with 2808 additions and 2009 deletions

View File

@@ -267,12 +267,12 @@ int ssl2_new(SSL *s)
{
SSL2_STATE *s2;
if ((s2=Malloc(sizeof *s2)) == NULL) goto err;
if ((s2=OPENSSL_malloc(sizeof *s2)) == NULL) goto err;
memset(s2,0,sizeof *s2);
if ((s2->rbuf=Malloc(
if ((s2->rbuf=OPENSSL_malloc(
SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER+2)) == NULL) goto err;
if ((s2->wbuf=Malloc(
if ((s2->wbuf=OPENSSL_malloc(
SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER+2)) == NULL) goto err;
s->s2=s2;
@@ -281,9 +281,9 @@ int ssl2_new(SSL *s)
err:
if (s2 != NULL)
{
if (s2->wbuf != NULL) Free(s2->wbuf);
if (s2->rbuf != NULL) Free(s2->rbuf);
Free(s2);
if (s2->wbuf != NULL) OPENSSL_free(s2->wbuf);
if (s2->rbuf != NULL) OPENSSL_free(s2->rbuf);
OPENSSL_free(s2);
}
return(0);
}
@@ -296,10 +296,10 @@ void ssl2_free(SSL *s)
return;
s2=s->s2;
if (s2->rbuf != NULL) Free(s2->rbuf);
if (s2->wbuf != NULL) Free(s2->wbuf);
if (s2->rbuf != NULL) OPENSSL_free(s2->rbuf);
if (s2->wbuf != NULL) OPENSSL_free(s2->wbuf);
memset(s2,0,sizeof *s2);
Free(s2);
OPENSSL_free(s2);
s->s2=NULL;
}