tlshd: fixup compile errors with HAVE_GNUTLS_PSK_ALLOCATE_CREDENTIALS2

[twilfredo]

Fixes the following compile errors when HAVE_GNUTLS_PSK_ALLOCATE_CREDENTIALS2 is enabled.

client.c:369:40: error: format ‘%c’ expects argument of type ‘char *’,
but argument 4 has type ‘int *’ [-Werror=format=]
  369 |         if (sscanf(identity, "NVMe%01d%c%02d %*s",
      |                                       ~^
      |                                        |
      |                                        char *
      |                                       %lc
  370 |                    &version, &type, &hash) == 3) {
      |                              ~~~~~
      |                              |
      |                              int *
server.c: In function ‘tlshd_tls13_server_psk_handshake’:
server.c:332:55: error: ‘GNUTLS_MAC_NONE’ undeclared
(first use in this function); did you mean ‘GNUTLS_EXT_NONE’?
  332 |                                                       GNUTLS_MAC_NONE);
      |                                                       ^~~~~~~~~~~~~~~
      |                                                       GNUTLS_EXT_NONE

Note that gnutls_psk_allocate_server_credentials2() accepts one of
GNUTLS_MAC_UNKNOWN, GNUTLS_MAC_SHA256 or GNUTLS_MAC_SHA384 as the
mac argument. Currently, GNUTLS_MAC_NONE does not exist in GnuTLS,
this patch changes this invalid type to GNUTLS_MAC_UNKNOWN.

Fixes: a5a25e9 ("tlshd: use gnutls_psk_allocate_{client,server}_credentials2")

[chucklever]

Please use the Linux kernel's style for the Fixes: tag:

Fixes: a5a25e9 ("tlshd: use gnutls_psk_allocate_{client,server}_credentials2")

No empty line between Fixes: and Signed-off-by.

I want to consult with Hannes about GNUTLS_MAC_NONE. Could be that he just guessed at what that symbol would be named, but I'd like to make sure. If you actually know the answer to that, please mention it in your patch description.

Thanks for the submission!

[twilfredo]

Please use the Linux kernel's style for the Fixes: tag:

Fixes: a5a25e9 ("tlshd: use gnutls_psk_allocate_{client,server}_credentials2")

No empty line between Fixes: and Signed-off-by.

Thanks, I have amended the commit message.

I want to consult with Hannes about GNUTLS_MAC_NONE. Could be that he just guessed at what that symbol would be named, but I'd like to make sure. If you actually know the answer to that, please mention it in your patch description.

It would indeed be good to double check with Hannes. The gnutls_psk_allocate_server_credentials2() function accepts 3 arguments for the mac argument. Those are GNUTLS_MAC_UNKNOWN, GNUTLS_MAC_SHA256 and GNUTLS_MAC_SHA384 [1]. So in this context, I thought GNUTLS_MAC_UNKNOWN made sense.

However, using GNUTLS_MAC_UNKNOWN also does cause other issues in GnuTLS, which will need to be addressed there [2].

[1] https://gitlab.com/gnutls/gnutls/-/blob/master/lib/psk.c#L244
[2] https://gitlab.com/gnutls/gnutls/-/issues/1729

Thanks for the submission!

[hreinecke]

Looks good to me.

Signed-off-by: Hannes Reinecke <[email protected]