Re: Windows: openssl & gssapi dislike each other

Imran Zaheer <imran.zhir@gmail.com>

From: Imran Zaheer <imran.zhir@gmail.com>

To: Tom Lane <tgl@sss.pgh.pa.us>

Cc: Andrew Dunstan <andrew@dunslane.net>, Dave Page <dpage@pgadmin.org>, PostgreSQL Developers <pgsql-hackers@lists.postgresql.org>

Date: 2024-06-09T07:28:59Z

Lists: pgsql-hackers

Commits

Same data as JSON: GET /api/v1/messages/:b64id/commits the thread's linked commits as JSON, with link sources. API reference →

Move GSSAPI includes into its own header
- e92c0632c147 18.0 landed
Tighten test_predtest's input checks, and improve error messages.
- 00ac25a3c365 17.0 cited
Collation documentation fixes.
- 8ba34c698d19 17.0 cited
contrib/sslinfo needs a fix too to make hamerkop happy.
- 568620dfd691 15.0 cited
Second attempt to silence SSL compile failures on hamerkop.
- 1241fcbd7e64 15.0 cited

Attachments

ninja-build-pg-with-openssl-gssapi.txt (text/plain)
v01-0001-approach02-undefine-macro-after-gssapi-includes.patch (application/octet-stream) patch v1-0001
v01-0001-approach03-undefine-macro-before-ssl-includes.patch (application/octet-stream) patch v1-0001

Hi

I am submitting two new patches. We can undefine the macro at two locations

1). As be-secure-openssl.c [1] was the actual
file where the conflict happened so I undefined the macro here before
the ssl includes. I changed the comment a little to make it understandable.
I am also attaching the error generated with ninja build.

OR

2). Right after the gssapi includes in libpq-be.h


Thanks
Imran Zaheer
Bitnine

[1]: https://github.com/postgres/postgres/blob/00ac25a3c365004821e819653c3307acd3294818/src/backend/libpq/be-secure-openssl.c#L46

On Sun, Jun 9, 2024 at 7:21 AM Tom Lane <tgl@sss.pgh.pa.us> wrote:
>
> Andrew Dunstan <andrew@dunslane.net> writes:
> > On 2024-06-08 Sa 06:22, Imran Zaheer wrote:
> >> Now this can either be solved by just just undefine the macro defined
> >> by wincrypt.h as done here [3]
> >> Or we should rearrange our headers. Openssl header should be at the
> >> bottom (after the gssapi includes).
>
> > Let's be consistent and use the #undef from [3].
>
> +1.  Depending on header order is not great, especially when you have
> to make it depend on an order that is directly contradictory to
> project conventions [0].
>
>                         regards, tom lane
>
> [0] https://wiki.postgresql.org/wiki/Committing_checklist#Policies