From 42d74e0c443760af91875af99d2655c9eb4c40df Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Thu, 11 Feb 2021 19:16:11 +0900 Subject: [PATCH] Fix copy-paste error with SHA256 digest length in checksum_helper.c Issue introduced by 87ae969, noticed while working on the area. While on it, fix some grammar in the surrounding static assertions. --- src/common/checksum_helper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/checksum_helper.c b/src/common/checksum_helper.c index 2881b2c178d..a895e2e2855 100644 --- a/src/common/checksum_helper.c +++ b/src/common/checksum_helper.c @@ -180,13 +180,13 @@ pg_checksum_final(pg_checksum_context *context, uint8 *output) StaticAssertStmt(sizeof(pg_crc32c) <= PG_CHECKSUM_MAX_LENGTH, "CRC-32C digest too big for PG_CHECKSUM_MAX_LENGTH"); StaticAssertStmt(PG_SHA224_DIGEST_LENGTH <= PG_CHECKSUM_MAX_LENGTH, - "SHA224 digest too for PG_CHECKSUM_MAX_LENGTH"); + "SHA224 digest too big for PG_CHECKSUM_MAX_LENGTH"); StaticAssertStmt(PG_SHA256_DIGEST_LENGTH <= PG_CHECKSUM_MAX_LENGTH, - "SHA256 digest too for PG_CHECKSUM_MAX_LENGTH"); + "SHA256 digest too big for PG_CHECKSUM_MAX_LENGTH"); StaticAssertStmt(PG_SHA384_DIGEST_LENGTH <= PG_CHECKSUM_MAX_LENGTH, - "SHA384 digest too for PG_CHECKSUM_MAX_LENGTH"); + "SHA384 digest too big for PG_CHECKSUM_MAX_LENGTH"); StaticAssertStmt(PG_SHA512_DIGEST_LENGTH <= PG_CHECKSUM_MAX_LENGTH, - "SHA512 digest too for PG_CHECKSUM_MAX_LENGTH"); + "SHA512 digest too big for PG_CHECKSUM_MAX_LENGTH"); switch (context->type) { @@ -207,7 +207,7 @@ pg_checksum_final(pg_checksum_context *context, uint8 *output) if (pg_cryptohash_final(context->raw_context.c_sha2, output) < 0) return -1; pg_cryptohash_free(context->raw_context.c_sha2); - retval = PG_SHA224_DIGEST_LENGTH; + retval = PG_SHA256_DIGEST_LENGTH; break; case CHECKSUM_TYPE_SHA384: if (pg_cryptohash_final(context->raw_context.c_sha2, output) < 0)