From 307cd025e2c9d7dfad87c3e60b03d737a657c744 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 22 Sep 2025 14:47:48 +0200 Subject: [PATCH 03/23] C11 anonymous unions [pgcrypto] --- contrib/pgcrypto/openssl.c | 14 +++++++------- contrib/pgcrypto/px.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c index f179e80c842..276d8306588 100644 --- a/contrib/pgcrypto/openssl.c +++ b/contrib/pgcrypto/openssl.c @@ -98,7 +98,7 @@ free_openssl_digest(OSSLDigest *digest) static unsigned digest_result_size(PX_MD *h) { - OSSLDigest *digest = (OSSLDigest *) h->p.ptr; + OSSLDigest *digest = (OSSLDigest *) h->ptr; int result = EVP_MD_CTX_size(digest->ctx); if (result < 0) @@ -110,7 +110,7 @@ digest_result_size(PX_MD *h) static unsigned digest_block_size(PX_MD *h) { - OSSLDigest *digest = (OSSLDigest *) h->p.ptr; + OSSLDigest *digest = (OSSLDigest *) h->ptr; int result = EVP_MD_CTX_block_size(digest->ctx); if (result < 0) @@ -122,7 +122,7 @@ digest_block_size(PX_MD *h) static void digest_reset(PX_MD *h) { - OSSLDigest *digest = (OSSLDigest *) h->p.ptr; + OSSLDigest *digest = (OSSLDigest *) h->ptr; if (!EVP_DigestInit_ex(digest->ctx, digest->algo, NULL)) elog(ERROR, "EVP_DigestInit_ex() failed"); @@ -131,7 +131,7 @@ digest_reset(PX_MD *h) static void digest_update(PX_MD *h, const uint8 *data, unsigned dlen) { - OSSLDigest *digest = (OSSLDigest *) h->p.ptr; + OSSLDigest *digest = (OSSLDigest *) h->ptr; if (!EVP_DigestUpdate(digest->ctx, data, dlen)) elog(ERROR, "EVP_DigestUpdate() failed"); @@ -140,7 +140,7 @@ digest_update(PX_MD *h, const uint8 *data, unsigned dlen) static void digest_finish(PX_MD *h, uint8 *dst) { - OSSLDigest *digest = (OSSLDigest *) h->p.ptr; + OSSLDigest *digest = (OSSLDigest *) h->ptr; if (!EVP_DigestFinal_ex(digest->ctx, dst, NULL)) elog(ERROR, "EVP_DigestFinal_ex() failed"); @@ -149,7 +149,7 @@ digest_finish(PX_MD *h, uint8 *dst) static void digest_free(PX_MD *h) { - OSSLDigest *digest = (OSSLDigest *) h->p.ptr; + OSSLDigest *digest = (OSSLDigest *) h->ptr; free_openssl_digest(digest); pfree(h); @@ -204,7 +204,7 @@ px_find_digest(const char *name, PX_MD **res) h->update = digest_update; h->finish = digest_finish; h->free = digest_free; - h->p.ptr = digest; + h->ptr = digest; *res = h; return 0; diff --git a/contrib/pgcrypto/px.h b/contrib/pgcrypto/px.h index 4b81fceab8e..7846a63f301 100644 --- a/contrib/pgcrypto/px.h +++ b/contrib/pgcrypto/px.h @@ -117,7 +117,7 @@ struct px_digest { unsigned code; void *ptr; - } p; + }; }; struct px_alias -- 2.51.0