mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-04-12 20:30:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace references to s->wbio with rl->bio

Browse Source 
We use the record layer reference to the BIO rather than the SSL object
reference. This removes an unneeded SSL object usage.

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19198)
This commit is contained in:
Matt Caswell 2022-08-22 16:09:23 +01:00
parent 310590139e
commit b5cf81f7c9
5 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssl/record/methods/ktls_meth.c
View File

@ -517,6 +517,12 @@ ktls_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
(*retrl)->funcs = &ossl_ktls_funcs;
/*
* TODO(RECLAYER): We're not ready to set the crypto state for the write
* record layer. Fix this once we are
*/
if (direction == OSSL_RECORD_DIRECTION_WRITE)
return 1;
ret = (*retrl)->funcs->set_crypto_state(*retrl, level, key, keylen, iv,
ivlen, mackey, mackeylen, ciph,
taglen, mactype, md, comp);

12
ssl/record/methods/tls_common.c
View File

@ -1365,7 +1365,7 @@ int tls_write_records(OSSL_RECORD_LAYER *rl, OSSL_RECORD_TEMPLATE *templates,
}
}
using_ktls = BIO_get_ktls_send(s->wbio);
using_ktls = BIO_get_ktls_send(rl->bio);
if (!ossl_assert(!using_ktls || !prefix)) {
SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
goto err;
@ -1781,21 +1781,21 @@ int tls_retry_write_records(OSSL_RECORD_LAYER *rl)
continue;
}
clear_sys_error();
if (s->wbio != NULL) {
if (rl->bio != NULL) {
s->rwstate = SSL_WRITING;
/*
* To prevent coalescing of control and data messages,
* such as in buffer_write, we flush the BIO
*/
if (BIO_get_ktls_send(s->wbio)
if (BIO_get_ktls_send(rl->bio)
&& thiswb->type != SSL3_RT_APPLICATION_DATA) {
i = BIO_flush(s->wbio);
i = BIO_flush(rl->bio);
if (i <= 0)
return i;
BIO_set_ktls_ctrl_msg(s->wbio, thiswb->type);
BIO_set_ktls_ctrl_msg(rl->bio, thiswb->type);
}
i = BIO_write(s->wbio, (char *)
i = BIO_write(rl->bio, (char *)
&(SSL3_BUFFER_get_buf(thiswb)
[SSL3_BUFFER_get_offset(thiswb)]),
(unsigned int)SSL3_BUFFER_get_left(thiswb));

47
ssl/record/rec_layer_s3.c
View File

@ -1256,9 +1256,8 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
{
OSSL_PARAM options[5], *opts = options;
OSSL_PARAM settings[6], *set = settings;
const OSSL_RECORD_METHOD *origmeth = s->rlayer.rrlmethod;
const OSSL_RECORD_METHOD **thismethod;
OSSL_RECORD_LAYER **thisrl;
OSSL_RECORD_LAYER **thisrl, *newrl = NULL;
BIO *thisbio;
SSL_CTX *sctx = SSL_CONNECTION_GET_CTX(s);
const OSSL_RECORD_METHOD *meth;
@ -1279,16 +1278,10 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
thisbio = s->wbio;
}
if (*thismethod != NULL && !(*thismethod)->free(*thisrl)) {
ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR);
return 0;
}
if (meth == NULL)
meth = *thismethod;
*thisrl = NULL;
if (meth != NULL)
*thismethod = meth;
if (!ossl_assert(*thismethod != NULL)) {
if (!ossl_assert(meth != NULL)) {
ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR);
return 0;
}
@ -1370,7 +1363,6 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
BIO *next = NULL;
unsigned int epoch = 0;;
if (direction == OSSL_RECORD_DIRECTION_READ) {
prev = s->rlayer.rrlnext;
if (SSL_CONNECTION_IS_DTLS(s)
@ -1390,18 +1382,13 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
s->rlayer.rrlnext = next;
}
rlret = (*thismethod)->new_record_layer(sctx->libctx,
sctx->propq,
version, s->server,
direction, level, epoch,
key, keylen, iv, ivlen,
mackey, mackeylen, ciph,
taglen, mactype, md, comp,
prev, thisbio,
next, NULL,
NULL, settings, options,
rlayer_dispatch, s,
thisrl);
rlret = meth->new_record_layer(sctx->libctx, sctx->propq, version,
s->server, direction, level, epoch,
key, keylen, iv, ivlen, mackey,
mackeylen, ciph, taglen, mactype, md,
comp, prev, thisbio, next, NULL, NULL,
settings, options, rlayer_dispatch, s,
&newrl);
BIO_free(prev);
switch (rlret) {
case OSSL_RECORD_RETURN_FATAL:
@ -1409,12 +1396,12 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
return 0;
case OSSL_RECORD_RETURN_NON_FATAL_ERR:
if (*thismethod != origmeth && origmeth != NULL) {
if (*thismethod != meth && *thismethod != NULL) {
/*
* We tried a new record layer method, but it didn't work out,
* so we fallback to the original method and try again
*/
*thismethod = origmeth;
meth = *thismethod;
continue;
}
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_NO_SUITABLE_RECORD_LAYER);
@ -1431,5 +1418,13 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
break;
}
if (*thismethod != NULL && !(*thismethod)->free(*thisrl)) {
SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
return 0;
}
*thisrl = newrl;
*thismethod = meth;
return ssl_post_record_layer_select(s, direction);
}

5
ssl/s3_msg.c
View File

@ -87,6 +87,11 @@ int ssl3_dispatch_alert(SSL *s)
sc->s3.alert_dispatch = 0;
if (sc->rlayer.wrlmethod == NULL) {
/* No write record layer so we can't sent and alert. We just ignore it */
return 1;
}
templ.type = SSL3_RT_ALERT;
templ.buf = &sc->s3.send_alert[0];
templ.buflen = 2;

10
ssl/ssl_lib.c
View File

@ -1358,8 +1358,6 @@ void ossl_ssl_connection_free(SSL *ssl)
X509_VERIFY_PARAM_free(s->param);
dane_final(&s->dane);
RECORD_LAYER_clear(&s->rlayer);
/* Ignore return value */
ssl_free_wbio_buffer(s);
@ -1368,6 +1366,8 @@ void ossl_ssl_connection_free(SSL *ssl)
BIO_free_all(s->rbio);
s->rbio = NULL;
RECORD_LAYER_clear(&s->rlayer);
BUF_MEM_free(s->init_buf);
/* add extra stuff */
@ -1463,6 +1463,8 @@ void SSL_set0_wbio(SSL *s, BIO *wbio)
/* Re-attach |bbio| to the new |wbio|. */
if (sc->bbio != NULL)
sc->wbio = BIO_push(sc->bbio, sc->wbio);
sc->rlayer.wrlmethod->set1_bio(sc->rlayer.wrl, sc->wbio);
}
void SSL_set_bio(SSL *s, BIO *rbio, BIO *wbio)
@ -4809,6 +4811,8 @@ int ssl_init_wbio_buffer(SSL_CONNECTION *s)
s->bbio = bbio;
s->wbio = BIO_push(bbio, s->wbio);
s->rlayer.wrlmethod->set1_bio(s->rlayer.wrl, s->wbio);
return 1;
}
@ -4819,6 +4823,8 @@ int ssl_free_wbio_buffer(SSL_CONNECTION *s)
return 1;
s->wbio = BIO_pop(s->wbio);
s->rlayer.wrlmethod->set1_bio(s->rlayer.wrl, s->wbio);
BIO_free(s->bbio);
s->bbio = NULL;