This is an automated email from the ASF dual-hosted git repository. leborchuk pushed a commit to branch REL_2_STABLE in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit dd614b51da7b0b6c3891fc6dde0408156c735022 Author: Dianjin Wang <[email protected]> AuthorDate: Tue Sep 15 16:44:36 2026 +0800 Remove the stale copy of sha2.h under src/backend/libpq src/backend/libpq/sha2.h carries Aaron D. Gifford's BSD 3-Clause notice and is registered in LICENSE under it, but nothing in the tree can reach the file: - no translation unit includes a bare "sha2.h", in src/backend/libpq or anywhere else - #include "libpq/sha2.h" cannot resolve to it either, because headers are found under src/include and there is no src/include/libpq/sha2.h The same upstream code does live in the tree, at src/common/sha2.c and src/common/sha2_int.h, both carrying the same Aaron D. Gifford copyright and the same OpenBSD and adg version keywords. Those two are real: sha2_int.h is included by sha2.c, cryptohash.c, cryptohash_openssl.c and sm3.c, and sha2.c is in src/common's object list. So the header is a leftover duplicate. Delete it, and repoint the LICENSE entry at the copies that are actually there rather than dropping the entry along with the file: the BSD 3-Clause code itself has not gone anywhere, only this stale copy of it has, and licenses/LICENSE-bsd3-sha2.txt still matches the notice on both remaining files. Note that the five "common/sha2.h" includes elsewhere in the tree refer to src/include/common/sha2.h, a different and PostgreSQL-licensed file, not to either of these. Assisted-by: Claude Code Backpatch-through: REL_2_STABLE --- LICENSE | 3 +- src/backend/libpq/sha2.h | 108 ----------------------------------------------- 2 files changed, 2 insertions(+), 109 deletions(-) diff --git a/LICENSE b/LICENSE index 95a183ffe93..43e78bf7be2 100644 --- a/LICENSE +++ b/LICENSE @@ -228,7 +228,8 @@ The PostgreSQL software includes: src/backend/utils/mb/wstrncmp.c see licenses/LICENSE-bsd3-wstrncmp.txt - src/backend/libpq/sha2.h + src/common/sha2.c + src/common/sha2_int.h see licenses/LICENSE-bsd3-sha2.txt ---------------------------- diff --git a/src/backend/libpq/sha2.h b/src/backend/libpq/sha2.h deleted file mode 100644 index e1874318eec..00000000000 --- a/src/backend/libpq/sha2.h +++ /dev/null @@ -1,108 +0,0 @@ -/* $PostgreSQL: pgsql/contrib/pgcrypto/sha2.h,v 1.5 2009/06/11 14:48:52 momjian Exp $ */ -/* $OpenBSD: sha2.h,v 1.2 2004/04/28 23:11:57 millert Exp $ */ - -/* - * FILE: sha2.h - * AUTHOR: Aaron D. Gifford <[email protected]> - * - * Copyright (c) 2000-2001, Aaron D. Gifford - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the names of contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $From: sha2.h,v 1.1 2001/11/08 00:02:01 adg Exp adg $ - */ - -#ifndef _SHA2_H -#define _SHA2_H - -/* avoid conflict with OpenSSL */ -#define SHA256_Init pg_SHA256_Init -#define SHA256_Update pg_SHA256_Update -#define SHA256_Final pg_SHA256_Final -#define SHA384_Init pg_SHA384_Init -#define SHA384_Update pg_SHA384_Update -#define SHA384_Final pg_SHA384_Final -#define SHA512_Init pg_SHA512_Init -#define SHA512_Update pg_SHA512_Update -#define SHA512_Final pg_SHA512_Final -#define SM3_Init pg_SM3_Init -#define SM3_Update pg_SM3_Update -#define SM3_Final pg_SM3_Final - -/*** SHA-224/256/384/512 Various Length Definitions ***********************/ -#define SHA224_BLOCK_LENGTH 64 -#define SHA224_DIGEST_LENGTH 28 -#define SHA224_DIGEST_STRING_LENGTH (SHA224_DIGEST_LENGTH * 2 + 1) -#define SHA256_BLOCK_LENGTH 64 -#define SHA256_DIGEST_LENGTH 32 -#define SHA256_DIGEST_STRING_LENGTH (SHA256_DIGEST_LENGTH * 2 + 1) -#define SHA384_BLOCK_LENGTH 128 -#define SHA384_DIGEST_LENGTH 48 -#define SHA384_DIGEST_STRING_LENGTH (SHA384_DIGEST_LENGTH * 2 + 1) -#define SHA512_BLOCK_LENGTH 128 -#define SHA512_DIGEST_LENGTH 64 -#define SHA512_DIGEST_STRING_LENGTH (SHA512_DIGEST_LENGTH * 2 + 1) - - -/*** SHA-256/384/512 Context Structures *******************************/ -typedef struct _SHA256_CTX -{ - uint32 state[8]; - uint64 bitcount; - uint8 buffer[SHA256_BLOCK_LENGTH]; -} SHA256_CTX; -typedef struct _SHA512_CTX -{ - uint64 state[8]; - uint64 bitcount[2]; - uint8 buffer[SHA512_BLOCK_LENGTH]; -} SHA512_CTX; - -typedef SHA256_CTX SHA224_CTX; -typedef SHA512_CTX SHA384_CTX; -typedef SHA256_CTX SM3_CTX; - -void SHA224_Init(SHA224_CTX *); -void SHA224_Update(SHA224_CTX *, const uint8 *, size_t); -void SHA224_Final(uint8[SHA224_DIGEST_LENGTH], SHA224_CTX *); - -void SHA256_Init(SHA256_CTX *); -void SHA256_Update(SHA256_CTX *, const uint8 *, size_t); -void SHA256_Final(uint8[SHA256_DIGEST_LENGTH], SHA256_CTX *); - -void SHA384_Init(SHA384_CTX *); -void SHA384_Update(SHA384_CTX *, const uint8 *, size_t); -void SHA384_Final(uint8[SHA384_DIGEST_LENGTH], SHA384_CTX *); - -void SHA512_Init(SHA512_CTX *); -void SHA512_Update(SHA512_CTX *, const uint8 *, size_t); -void SHA512_Final(uint8[SHA512_DIGEST_LENGTH], SHA512_CTX *); - -void SM3_Init(SM3_CTX *); -void SM3_Update(SM3_CTX *, const uint8 *, size_t); -void SM3_Final(uint8[SHA512_DIGEST_LENGTH], SM3_CTX *); - -#endif /* _SHA2_H */ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
