diff options
author | Tomas Mraz <tomas@openssl.org> | 2021-03-01 15:49:50 +0100 |
---|---|---|
committer | Pauli <ppzgs1@gmail.com> | 2021-03-03 10:00:21 +1000 |
commit | fffb67343e6e5bdfce34f2b3e0add058c1be420a (patch) | |
tree | 0c39e9272274e4c8734c12919d1b057cf0bf52e4 | |
parent | 8d05a65256294f70a3bc34b7d13cc38e41a17402 (diff) |
Remove todos in providers/implementations/include/prov
Those TODOs are not relevant anymore as the headers
are now in providers.
Also make the header guard defines better reflect the
header placement.
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14367)
-rw-r--r-- | providers/implementations/include/prov/blake2.h | 7 | ||||
-rw-r--r-- | providers/implementations/include/prov/md5_sha1.h | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/providers/implementations/include/prov/blake2.h b/providers/implementations/include/prov/blake2.h index 33b82490ef..305f7a3c53 100644 --- a/providers/implementations/include/prov/blake2.h +++ b/providers/implementations/include/prov/blake2.h @@ -7,9 +7,8 @@ * https://www.openssl.org/source/license.html */ -/* TODO(3.0) Move this header into provider when dependencies are removed */ -#ifndef OSSL_PROVIDERS_DEFAULT_INCLUDE_INTERNAL_BLAKE2_H -# define OSSL_PROVIDERS_DEFAULT_INCLUDE_INTERNAL_BLAKE2_H +#ifndef OSSL_PROV_BLAKE2_H +# define OSSL_PROV_BLAKE2_H # include <openssl/opensslconf.h> @@ -118,4 +117,4 @@ void ossl_blake2s_param_set_personal(BLAKE2S_PARAM *P, const uint8_t *personal, void ossl_blake2s_param_set_salt(BLAKE2S_PARAM *P, const uint8_t *salt, size_t length); -#endif /* OSSL_PROVIDERS_DEFAULT_INCLUDE_INTERNAL_BLAKE2_H */ +#endif /* OSSL_PROV_BLAKE2_H */ diff --git a/providers/implementations/include/prov/md5_sha1.h b/providers/implementations/include/prov/md5_sha1.h index 33bfa29b51..284ec957ba 100644 --- a/providers/implementations/include/prov/md5_sha1.h +++ b/providers/implementations/include/prov/md5_sha1.h @@ -7,9 +7,8 @@ * https://www.openssl.org/source/license.html */ -/* TODO(3.0) Move this header into provider when dependencies are removed */ -#ifndef OSSL_INTERNAL_MD5_SHA1_H -# define OSSL_INTERNAL_MD5_SHA1_H +#ifndef OSSL_PROV_MD5_SHA1_H +# define OSSL_PROV_MD5_SHA1_H # include <openssl/opensslconf.h> @@ -34,4 +33,4 @@ int ossl_md5_sha1_ctrl(MD5_SHA1_CTX *mctx, int cmd, int mslen, void *ms); # endif /* OPENSSL_NO_MD5 */ -#endif /* OSSL_INTERNAL_MD5_SHA1_H */ +#endif /* OSSL_PROV_MD5_SHA1_H */ |