diff options
author | Pauli <paul.dale@oracle.com> | 2020-11-16 12:14:26 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2020-11-19 07:39:13 +1000 |
commit | b68a947fd23a1e9189399cb9cc4ee75801bb142b (patch) | |
tree | fcebc6813e7b2a555f7e3189fdc892fd147b12ea | |
parent | 5687afdf032ac1d0e92958c209f6c493c347fa25 (diff) | |
download | openssl-b68a947fd23a1e9189399cb9cc4ee75801bb142b.zip openssl-b68a947fd23a1e9189399cb9cc4ee75801bb142b.tar.gz openssl-b68a947fd23a1e9189399cb9cc4ee75801bb142b.tar.bz2 |
Rename SHA3 internal functions so they have an ossl_ prefix
These are: keccak_kmac_init(), sha3_final(), sha3_init(), sha3_reset() and
sha3_update().
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13417)
-rw-r--r-- | crypto/sha/sha3.c | 14 | ||||
-rw-r--r-- | include/internal/sha3.h | 11 | ||||
-rw-r--r-- | providers/implementations/digests/sha3_prov.c | 8 |
3 files changed, 17 insertions, 16 deletions
diff --git a/crypto/sha/sha3.c b/crypto/sha/sha3.c index fafa355..4aa008f 100644 --- a/crypto/sha/sha3.c +++ b/crypto/sha/sha3.c @@ -12,18 +12,18 @@ void SHA3_squeeze(uint64_t A[5][5], unsigned char *out, size_t len, size_t r); -void sha3_reset(KECCAK1600_CTX *ctx) +void ossl_sha3_reset(KECCAK1600_CTX *ctx) { memset(ctx->A, 0, sizeof(ctx->A)); ctx->bufsz = 0; } -int sha3_init(KECCAK1600_CTX *ctx, unsigned char pad, size_t bitlen) +int ossl_sha3_init(KECCAK1600_CTX *ctx, unsigned char pad, size_t bitlen) { size_t bsz = SHA3_BLOCKSIZE(bitlen); if (bsz <= sizeof(ctx->buf)) { - sha3_reset(ctx); + ossl_sha3_reset(ctx); ctx->block_size = bsz; ctx->md_size = bitlen / 8; ctx->pad = pad; @@ -33,16 +33,16 @@ int sha3_init(KECCAK1600_CTX *ctx, unsigned char pad, size_t bitlen) return 0; } -int keccak_kmac_init(KECCAK1600_CTX *ctx, unsigned char pad, size_t bitlen) +int ossl_keccak_kmac_init(KECCAK1600_CTX *ctx, unsigned char pad, size_t bitlen) { - int ret = sha3_init(ctx, pad, bitlen); + int ret = ossl_sha3_init(ctx, pad, bitlen); if (ret) ctx->md_size *= 2; return ret; } -int sha3_update(KECCAK1600_CTX *ctx, const void *_inp, size_t len) +int ossl_sha3_update(KECCAK1600_CTX *ctx, const void *_inp, size_t len) { const unsigned char *inp = _inp; size_t bsz = ctx->block_size; @@ -84,7 +84,7 @@ int sha3_update(KECCAK1600_CTX *ctx, const void *_inp, size_t len) return 1; } -int sha3_final(unsigned char *md, KECCAK1600_CTX *ctx) +int ossl_sha3_final(unsigned char *md, KECCAK1600_CTX *ctx) { size_t bsz = ctx->block_size; size_t num = ctx->bufsz; diff --git a/include/internal/sha3.h b/include/internal/sha3.h index 81ba41a..7cd4630 100644 --- a/include/internal/sha3.h +++ b/include/internal/sha3.h @@ -40,11 +40,12 @@ struct keccak_st { PROV_SHA3_METHOD meth; }; -void sha3_reset(KECCAK1600_CTX *ctx); -int sha3_init(KECCAK1600_CTX *ctx, unsigned char pad, size_t bitlen); -int keccak_kmac_init(KECCAK1600_CTX *ctx, unsigned char pad, size_t bitlen); -int sha3_update(KECCAK1600_CTX *ctx, const void *_inp, size_t len); -int sha3_final(unsigned char *md, KECCAK1600_CTX *ctx); +void ossl_sha3_reset(KECCAK1600_CTX *ctx); +int ossl_sha3_init(KECCAK1600_CTX *ctx, unsigned char pad, size_t bitlen); +int ossl_keccak_kmac_init(KECCAK1600_CTX *ctx, unsigned char pad, + size_t bitlen); +int ossl_sha3_update(KECCAK1600_CTX *ctx, const void *_inp, size_t len); +int ossl_sha3_final(unsigned char *md, KECCAK1600_CTX *ctx); size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len, size_t r); diff --git a/providers/implementations/digests/sha3_prov.c b/providers/implementations/digests/sha3_prov.c index 38e2beb..6b44792 100644 --- a/providers/implementations/digests/sha3_prov.c +++ b/providers/implementations/digests/sha3_prov.c @@ -50,7 +50,7 @@ static int keccak_init(void *vctx) if (!ossl_prov_is_running()) return 0; /* The newctx() handles most of the ctx fixed setup. */ - sha3_reset((KECCAK1600_CTX *)vctx); + ossl_sha3_reset((KECCAK1600_CTX *)vctx); return 1; } @@ -118,7 +118,7 @@ static size_t generic_sha3_absorb(void *vctx, const void *inp, size_t len) static int generic_sha3_final(unsigned char *md, void *vctx) { - return sha3_final(md, (KECCAK1600_CTX *)vctx); + return ossl_sha3_final(md, (KECCAK1600_CTX *)vctx); } static PROV_SHA3_METHOD sha3_generic_md = @@ -198,7 +198,7 @@ static void *name##_newctx(void *provctx) \ \ if (ctx == NULL) \ return NULL; \ - sha3_init(ctx, pad, bitlen); \ + ossl_sha3_init(ctx, pad, bitlen); \ SHA3_SET_MD(uname, typ) \ return ctx; \ } @@ -212,7 +212,7 @@ static void *uname##_newctx(void *provctx) \ \ if (ctx == NULL) \ return NULL; \ - keccak_kmac_init(ctx, pad, bitlen); \ + ossl_keccak_kmac_init(ctx, pad, bitlen); \ ctx->meth = sha3_generic_md; \ return ctx; \ } |