Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 407e0b0

Browse files
committed
Change ALPN protocol ID to IANA-approved "postgresql"
"TBD-pgsql" was a placeholder until the IANA registration was approved. Discussion: https://www.postgresql.org/message-id/87jzk2hj2n.fsf%40wibble.ilmari.org Discussion: https://mailarchive.ietf.org/arch/msg/tls-reg-review/9LWPzQfOpbc8dTT7vc9ahNeNaiw/
1 parent 31e8f4e commit 407e0b0

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

doc/src/sgml/libpq.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2949,7 +2949,7 @@ const char *PQsslAttribute(const PGconn *conn, const char *attribute_name);
29492949
<para>
29502950
Application protocol selected by the TLS Application-Layer
29512951
Protocol Negotiation (ALPN) extension. The only protocol
2952-
supported by libpq is <literal>TBD-pgsql</literal>, so this is
2952+
supported by libpq is <literal>postgresql</literal>, so this is
29532953
mainly useful for checking whether the server supported ALPN or
29542954
not. Empty string if ALPN was not used.
29552955
</para>

doc/src/sgml/protocol.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1564,7 +1564,7 @@ SELCT 1/0;<!-- this typo is intentional -->
15641564
required to use the ALPN extension defined
15651565
by <ulink url="https://tools.ietf.org/html/rfc7301">RFC 7301</ulink> to
15661566
protect against protocol confusion attacks.
1567-
The <productname>PostgreSQL</productname> protocol is "TBD-pgsql" as
1567+
The <productname>PostgreSQL</productname> protocol is "postgresql" as
15681568
registered
15691569
at <ulink url="https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids">IANA
15701570
TLS ALPN Protocol IDs</ulink> registry.

src/include/libpq/pqcomm.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ typedef struct CancelRequestPacket
156156
*
157157
* The #define can be used to initialize a char[] vector to use directly in the API
158158
*/
159-
#define PG_ALPN_PROTOCOL "TBD-pgsql"
160-
#define PG_ALPN_PROTOCOL_VECTOR { 9, 'T','B','D','-','p','g','s','q','l' }
159+
#define PG_ALPN_PROTOCOL "postgresql"
160+
#define PG_ALPN_PROTOCOL_VECTOR { 10, 'p','o','s','t','g','r','e','s','q','l' }
161161

162162
/*
163163
* A client can also start by sending a SSL or GSSAPI negotiation request to

0 commit comments

Comments
 (0)