Commit 89e80e0
tlshd: fix a couple of compiling errors with QUIC enabled
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]>1 parent 98c3e0d commit 89e80e0
2 files changed
+2
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
513 | 513 | | |
514 | 514 | | |
515 | 515 | | |
516 | | - | |
| 516 | + | |
517 | 517 | | |
518 | 518 | | |
519 | 519 | | |
| |||
568 | 568 | | |
569 | 569 | | |
570 | 570 | | |
571 | | - | |
| 571 | + | |
572 | 572 | | |
573 | 573 | | |
574 | 574 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
505 | 505 | | |
506 | 506 | | |
507 | 507 | | |
508 | | - | |
509 | 508 | | |
510 | 509 | | |
511 | 510 | | |
| |||
0 commit comments