summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPauli <pauli@openssl.org>2021-05-31 14:27:58 +1000
committerPauli <pauli@openssl.org>2021-06-02 16:30:15 +1000
commit0848b943a8c481e3fb1e08b70735392d6d6d70f4 (patch)
treebd0f0da7079242ec5c4b0718321c993781af7d26
parent407820c0e311efaafff7fdc8eafdff6e70f89eb2 (diff)
providers: remove TODOs
Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15539)
-rw-r--r--providers/common/provider_util.c3
-rw-r--r--providers/implementations/encode_decode/encode_key2any.c1
-rw-r--r--providers/implementations/rands/seeding/rand_unix.c2
-rw-r--r--providers/implementations/rands/seeding/rand_vms.c2
4 files changed, 2 insertions, 6 deletions
diff --git a/providers/common/provider_util.c b/providers/common/provider_util.c
index 6ed4378a2f..30fe7c6b21 100644
--- a/providers/common/provider_util.c
+++ b/providers/common/provider_util.c
@@ -49,7 +49,6 @@ static int load_common(const OSSL_PARAM params[], const char **propquery,
}
*engine = NULL;
- /* TODO legacy stuff, to be removed */
/* Inside the FIPS module, we don't support legacy ciphers */
#if !defined(FIPS_MODULE) && !defined(OPENSSL_NO_ENGINE)
p = OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_ENGINE);
@@ -87,7 +86,6 @@ int ossl_prov_cipher_load_from_params(PROV_CIPHER *pc,
EVP_CIPHER_free(pc->alloc_cipher);
ERR_set_mark();
pc->cipher = pc->alloc_cipher = EVP_CIPHER_fetch(ctx, p->data, propquery);
- /* TODO legacy stuff, to be removed */
#ifndef FIPS_MODULE /* Inside the FIPS module, we don't support legacy ciphers */
if (pc->cipher == NULL)
pc->cipher = EVP_get_cipherbyname(p->data);
@@ -157,7 +155,6 @@ int ossl_prov_digest_load_from_params(PROV_DIGEST *pd,
ERR_set_mark();
ossl_prov_digest_fetch(pd, ctx, p->data, propquery);
- /* TODO legacy stuff, to be removed */
#ifndef FIPS_MODULE /* Inside the FIPS module, we don't support legacy digests */
if (pd->md == NULL)
pd->md = EVP_get_digestbyname(p->data);
diff --git a/providers/implementations/encode_decode/encode_key2any.c b/providers/implementations/encode_decode/encode_key2any.c
index f95c785522..8d32c64fbf 100644
--- a/providers/implementations/encode_decode/encode_key2any.c
+++ b/providers/implementations/encode_decode/encode_key2any.c
@@ -602,7 +602,6 @@ static int prepare_ec_explicit_params(const void *eckey,
/*
* This implements EcpkParameters, where the CHOICE is based on whether there
* is a curve name (curve nid) to be found or not. See RFC 3279 for details.
- * TODO: shouldn't we use i2d_ECPKParameters()?
*/
static int prepare_ec_params(const void *eckey, int nid, int save,
void **pstr, int *pstrtype)
diff --git a/providers/implementations/rands/seeding/rand_unix.c b/providers/implementations/rands/seeding/rand_unix.c
index fd7373a3e9..f77f6e0324 100644
--- a/providers/implementations/rands/seeding/rand_unix.c
+++ b/providers/implementations/rands/seeding/rand_unix.c
@@ -601,7 +601,7 @@ void ossl_rand_pool_keep_random_devices_open(int keep)
/*
* Try the various seeding methods in turn, exit when successful.
*
- * TODO(DRBG): If more than one entropy source is available, is it
+ * If more than one entropy source is available, is it
* preferable to stop as soon as enough entropy has been collected
* (as favored by @rsalz) or should one rather be defensive and add
* more entropy than requested and/or from different sources?
diff --git a/providers/implementations/rands/seeding/rand_vms.c b/providers/implementations/rands/seeding/rand_vms.c
index 98d0ce31a4..8f8855321b 100644
--- a/providers/implementations/rands/seeding/rand_vms.c
+++ b/providers/implementations/rands/seeding/rand_vms.c
@@ -160,7 +160,7 @@ static const struct item_st RMI_item_data[] = {
{4, RMI$_BLKOUT},
{4, RMI$_DIRIN},
{4, RMI$_DIROUT},
- /* We currently get a fault when trying these. TODO: To be figured out. */
+ /* We currently get a fault when trying these */
#if 0
{140, RMI$_MSCP_EVERYTHING}, /* 35 32-bit words */
{152, RMI$_DDTM_ALL}, /* 38 32-bit words */