diff options
| author | Matt Caswell <matt@openssl.org> | 2022-07-20 15:22:41 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2022-08-18 16:38:13 +0100 |
| commit | 499b2c4654a28838924b60cab754fffa7b9f5609 (patch) | |
| tree | 6a1e6d95a44dbc1f0c4d84908e4c1ee04a60b83c /ssl | |
| parent | 51ccad3f40e5f000da8364b1bb4bddd41657c96e (diff) | |
Remove some more redundant TODO(RECLAYER) comments
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18132)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/record/methods/tls1_meth.c | 7 | ||||
| -rw-r--r-- | ssl/record/rec_layer_d1.c | 1 | ||||
| -rw-r--r-- | ssl/record/rec_layer_s3.c | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/ssl/record/methods/tls1_meth.c b/ssl/record/methods/tls1_meth.c index b7b9f6989b..698ebdc008 100644 --- a/ssl/record/methods/tls1_meth.c +++ b/ssl/record/methods/tls1_meth.c @@ -96,10 +96,6 @@ static int tls1_set_crypto_state(OSSL_RECORD_LAYER *rl, int level, (int)taglen, NULL) <= 0 || EVP_CIPHER_CTX_ctrl(ciph_ctx, EVP_CTRL_CCM_SET_IV_FIXED, (int)ivlen, iv) <= 0 - /* - * TODO(RECLAYER): Why do we defer setting the key until here? - * why not in the initial EVP_DecryptInit_ex() call? - */ || !EVP_DecryptInit_ex(ciph_ctx, NULL, NULL, key, NULL)) { ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR); return OSSL_RECORD_RETURN_FATAL; @@ -224,8 +220,6 @@ static int tls1_cipher(OSSL_RECORD_LAYER *rl, SSL3_RECORD *recs, size_t n_recs, seq = rl->sequence; if (rl->isdtls) { - /* TODO(RECLAYER): FIXME */ - /* DTLS does not support pipelining */ unsigned char dtlsseq[8], *p = dtlsseq; s2n(rl->epoch, p); @@ -472,7 +466,6 @@ static int tls1_mac(OSSL_RECORD_LAYER *rl, SSL3_RECORD *rec, unsigned char *md, } if (rl->isdtls) { - /* TODO(RECLAYER): FIX ME */ unsigned char dtlsseq[8], *p = dtlsseq; s2n(rl->epoch, p); diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c index df9d41a762..50762e0762 100644 --- a/ssl/record/rec_layer_d1.c +++ b/ssl/record/rec_layer_d1.c @@ -274,7 +274,6 @@ int dtls1_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, do { rr = &sc->rlayer.tlsrecs[sc->rlayer.num_recs]; - /* TODO(RECLAYER): Check HANDLE_RLAYER_RETURN for DTLS */ ret = HANDLE_RLAYER_RETURN(sc, sc->rrlmethod->read_record(sc->rrl, &rr->rechandle, &rr->version, &rr->type, diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c index 4d2fa44dbf..b695556211 100644 --- a/ssl/record/rec_layer_s3.c +++ b/ssl/record/rec_layer_s3.c @@ -1121,10 +1121,6 @@ int ossl_tls_handle_rlayer_return(SSL_CONNECTION *s, int ret, char *file, * If we got a retry or success then *ret is already correct, * otherwise we need to convert the return value. */ - /* - * TODO(RECLAYER): What does a non fatal err that isn't a retry even - * mean??? - */ if (ret == OSSL_RECORD_RETURN_NON_FATAL_ERR || ret == OSSL_RECORD_RETURN_EOF) ret = 0; else if (ret < OSSL_RECORD_RETURN_NON_FATAL_ERR) |