[SCM] GNU gnutls branch, master, updated. gnutls_3_0_21-2-g8eb212b

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=8eb212b1e03671b774ed13071eb72b402e1c0882

The branch, master has been updated
       via  8eb212b1e03671b774ed13071eb72b402e1c0882 (commit)
      from  ae312d9b32361e88b6b522cf3478f06ea4392bbf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8eb212b1e03671b774ed13071eb72b402e1c0882
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Jul 4 17:49:51 2012 +0200

    A deinit function implies  GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE. Based on 
patch by David Woodhouse.

-----------------------------------------------------------------------

Summary of changes:
 lib/gnutls_privkey.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index e87f1ab..de8061f 100644
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -435,7 +435,8 @@ int ret;
  *
  * This function will associate the given callbacks with the
  * #gnutls_privkey_t structure. At least one of the two callbacks
- * must be non-null.
+ * must be non-null. If a deinitialization function is provided
+ * then flags is assumed to contain %GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE.
  *
  * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
  *   negative error value.
@@ -471,6 +472,10 @@ int ret;
   pkey->pk_algorithm = pk;
   pkey->flags = flags;
 
+  /* Ensure gnutls_privkey_deinit() calls the deinit_func */
+  if (deinit_func)
+    pkey->flags |= GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE;
+
   return 0;
 }
 


hooks/post-receive
-- 
GNU gnutls