Explicitly state when these functions take ownership of the parameters and make the semantics the same for both functions. Drop a no-longer applicable TODO comment. (this is independent of the comments needing to be moved to tls.c in doxygen format) --- ell/tls.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/ell/tls.h b/ell/tls.h index 0ca6def..b67492b 100644 --- a/ell/tls.h +++ b/ell/tls.h @@ -98,19 +98,21 @@ void l_tls_write(struct l_tls *tls, const uint8_t *data, size_t len); /* Submit TLS payload from underlying transport to be decrypted */ void l_tls_handle_rx(struct l_tls *tls, const uint8_t *data, size_t len); -/* If peer is to be authenticated, supply the CA certificates */ +/* + * If peer is to be authenticated, supply the CA certificates. On success + * the l_tls object takes ownership of the queue and the individual l_cert + * objects and they should not be freed by the caller afterwards. + */ bool l_tls_set_cacert(struct l_tls *tls, struct l_queue *ca_certs); /* - * If we are to be authenticated, supply our certificate and private key. On the - * client this is optional. - * TODO: allow NULL private key if certificate file contains the key. + * If we are to be authenticated, supply our certificate and private key. + * On the client this is optional. On success, the l_tls object takes + * ownership of the certchain and the key objects and they should not be + * freed by the caller afterwards. * TODO: it may also be useful for the caller to be able to supply one * certificate of each type so they can be used depending on which is compatible * with the negotiated parameters. - * - * Note: Providing certchain and priv_key will move memory ownership into the - * tls object. These objects should not be freed by the caller. */ bool l_tls_set_auth_data(struct l_tls *tls, struct l_certchain *certchain, -- 2.20.1

There was an assumption that argv elements beyond argc were NULL. This may be true under some conditions but I guess it's better to not assume that in example code. --- examples/https-client-test.c | 17 +++++++++++------ examples/https-server-test.c | 6 ++++-- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/examples/https-client-test.c b/examples/https-client-test.c index 281bdb8..11dce88 100644 --- a/examples/https-client-test.c +++ b/examples/https-client-test.c @@ -134,9 +134,9 @@ int main(int argc, char *argv[]) struct sockaddr_in addr; int fd; bool auth_ok; - struct l_certchain *cert; - struct l_key *priv_key; - struct l_queue *ca_cert; + struct l_certchain *cert = NULL; + struct l_key *priv_key = NULL; + struct l_queue *ca_cert = NULL; if (argc != 2 && argc != 3 && argc != 6) { printf("Usage: %s <https-host-name> [<ca-cert-path> " @@ -192,9 +192,14 @@ int main(int argc, char *argv[]) if (getenv("TLS_DEBUG")) l_tls_set_debug(tls, https_tls_debug_cb, NULL, NULL); - ca_cert = l_pem_load_certificate_list(argv[2]); - cert = l_pem_load_certificate_chain(argv[3]); - priv_key = l_pem_load_private_key(argv[4], argv[5], NULL); + if (argc >= 3) + ca_cert = l_pem_load_certificate_list(argv[2]); + + if (argc >= 4) + cert = l_pem_load_certificate_chain(argv[3]); + + if (argc >= 6) + priv_key = l_pem_load_private_key(argv[4], argv[5], NULL); auth_ok = (argc <= 2 || l_tls_set_cacert(tls, ca_cert)) && (argc <= 5 || diff --git a/examples/https-server-test.c b/examples/https-server-test.c index 93c0bcf..813650a 100644 --- a/examples/https-server-test.c +++ b/examples/https-server-test.c @@ -122,7 +122,7 @@ int main(int argc, char *argv[]) bool auth_ok; struct l_certchain *cert; struct l_key *priv_key; - struct l_queue *ca_cert; + struct l_queue *ca_cert = NULL; if (argc != 4 && argc != 5) { printf("Usage: %s <server-cert-path> <server-key-path> " @@ -179,7 +179,9 @@ int main(int argc, char *argv[]) cert = l_pem_load_certificate_chain(argv[1]); priv_key = l_pem_load_private_key(argv[2], argv[3], NULL); - ca_cert = l_pem_load_certificate_list(argv[4]); + + if (argc >= 5) + ca_cert = l_pem_load_certificate_list(argv[4]); auth_ok = l_tls_set_auth_data(tls, cert, priv_key) && (argc <= 4 || l_tls_set_cacert(tls, ca_cert)) && -- 2.20.1