Perform reference counting for tls_config. This allows tls_config_free() to

be called as soon as it has been passed to the final tls_configure() call,
simplifying lifetime tracking for the application.

Requested some time ago by tedu@.

ok beck@

1 files changed, 6 insertions, 1 deletions

diff --git a/src/lib/libtls/tls_config.c b/src/lib/libtls/tls_config.c
index 3945da75ac..8f0bd70508 100644
--- a/src/lib/libtls/tls_config.c
+++ b/src/lib/libtls/tls_config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_config.c,v 1.39 2017/05/02 03:59:45 deraadt Exp $ */
+/* $OpenBSD: tls_config.c,v 1.40 2017/05/06 20:59:28 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -207,6 +207,8 @@ tls_config_new(void)
         if ((config->keypair = tls_keypair_new()) == NULL)
                 goto err;
 
+        config->refcount = 1;
+
         /*
          * Default configuration.
          */
@@ -252,6 +254,9 @@ tls_config_free(struct tls_config *config)
         if (config == NULL)
                 return;
 
+        if (--config->refcount > 0)
+                return;
+
         for (kp = config->keypair; kp != NULL; kp = nkp) {
                 nkp = kp->next;
                 tls_keypair_free(kp);