tlshd: fix a couple of compiling errors with QUIC enabled #111
Conversation
This patch fixes these compiling errors with QUIC enabled:
client.c: In function ‘tlshd_quic_client_set_x509_session’:
client.c:489:43: error: ‘xcred’ undeclared (first use in this function);
did you mean ‘cred’?
489 | ret = tlshd_client_get_truststore(xcred);
| ^~~~~
| cred
client.c:489:43: note: each undeclared identifier is reported only once
for each function it appears in
client.c: In function ‘tlshd_quic_client_set_psk_session’:
client.c:544:31: error: incompatible types when initializing type
‘key_serial_t’ {aka ‘int’} using type ‘GArray’ {aka ‘struct _GArray’}
544 | key_serial_t peerid = conn->parms->peerids[0];
| ^~~~
server.c: In function ‘tlshd_quic_server_set_x509_session’:
server.c:481:15: error: unused variable ‘cafile’ [-Werror=unused-variable]
481 | char *cafile;
| ^~~~~~
Commit fe3a78a ("tlshd: Refactor trust store management") passed
incorrect 'xcred' to tlshd_client_get_truststore(), while it should
be 'cred'. The unused variable 'cafile' should also be cleaned in
tlshd_quic_server_set_x509_session().
Commit 18b04a6 ("tlshd: Store peer IDs in a GArray") forgot to
fix the parms->peerids access in tlshd_quic_client_set_psk_session().
Fixes: fe3a78a ("tlshd: Refactor trust store management")
Fixes: 18b04a6 ("tlshd: Store peer IDs in a GArray")
Signed-off-by: Xin Long <[email protected]>
|
I didn't realize QUIC could be disabled. The compile test Actions need to be updated. |
|
@chucklever it enables QUIC build in configure.ac only if /usr/include/linux/quic.h exists, as the QUIC build has dependence on this uapi header file (installed from kernel). Maybe we should do something like this? |
|
The handshake netlink protocol is defined by a kernel header too. I've dealt with that by copying it to src/tlshd/netlink.h every time the protocol changes. Maybe that's not the best approach. I'm not sure I want our testing apparatus to curl an external file, though. Any thoughts/opinions welcome. Meanwhile I will plan to merge this PR into a minor release of 1.2. |
|
Manually pushed to ktls-utils-1.2-fixes. An official 1.2 minor release that includes this PR is forthcoming. |
|
@chucklever when will it go to 'main' branch? |
I'm debating with myself whether to release ktls-utils-1.2.1 from a non-main branch or keep all the official releases on "main". I hope to release in a week or two. Maybe earlier. |
|
I guess I got this backwards. First, commit to main. Then cherry-pick to the release branch. |
|
@chucklever That's great! ktils-utils main branch is used in the QUIC selftest Actions. |
2 participants
This patch fixes these compiling errors with QUIC enabled:
client.c: In function ‘tlshd_quic_client_set_x509_session’: client.c:489:43: error: ‘xcred’ undeclared (first use in this function);
did you mean ‘cred’?
489 | ret = tlshd_client_get_truststore(xcred);
| ^~~~~
| cred
client.c:489:43: note: each undeclared identifier is reported only once
for each function it appears in
client.c: In function ‘tlshd_quic_client_set_psk_session’: client.c:544:31: error: incompatible types when initializing type
‘key_serial_t’ {aka ‘int’} using type ‘GArray’ {aka ‘struct _GArray’}
544 | key_serial_t peerid = conn->parms->peerids[0];
| ^~~~
server.c: In function ‘tlshd_quic_server_set_x509_session’: server.c:481:15: error: unused variable ‘cafile’ [-Werror=unused-variable]
481 | char *cafile;
| ^~~~~~
Commit fe3a78a ("tlshd: Refactor trust store management") passed incorrect 'xcred' to tlshd_client_get_truststore(), while it should be 'cred'. The unused variable 'cafile' should also be cleaned in tlshd_quic_server_set_x509_session().
Commit 18b04a6 ("tlshd: Store peer IDs in a GArray") forgot to fix the parms->peerids access in tlshd_quic_client_set_psk_session().
Fixes: fe3a78a ("tlshd: Refactor trust store management")
Fixes: 18b04a6 ("tlshd: Store peer IDs in a GArray")