Commit 8fea967
committed
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 6d296ef commit 8fea967
2 files changed
+2
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
486 | 486 | | |
487 | 487 | | |
488 | 488 | | |
489 | | - | |
| 489 | + | |
490 | 490 | | |
491 | 491 | | |
492 | 492 | | |
| |||
541 | 541 | | |
542 | 542 | | |
543 | 543 | | |
544 | | - | |
| 544 | + | |
545 | 545 | | |
546 | 546 | | |
547 | 547 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
478 | 478 | | |
479 | 479 | | |
480 | 480 | | |
481 | | - | |
482 | 481 | | |
483 | 482 | | |
484 | 483 | | |
| |||
0 commit comments