Changeset 45b7b83 in mod_gnutls for src

Timestamp:

Jun 15, 2016, 6:02:00 PM (3 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, master, upstream

Children:

eee1432

Parents:

db9ef68

Message:

Deinit PGP private key and keyring on config pool cleanup

File:

• src/gnutls_config.c (modified) (5 diffs)

src/gnutls_config.c

@@ -151 +151 @@
     }
 
+    if (sc->privkey_pgp)
+    {
+        gnutls_privkey_deinit(sc->privkey_pgp);
+        sc->privkey_pgp = NULL;
+#if GNUTLS_VERSION_NUMBER < 0x030312
+        gnutls_openpgp_privkey_deinit(sc->privkey_pgp_internal);
+        sc->privkey_pgp_internal = NULL;
+#endif
+    }
+
+    if (sc->pgp_list)
+    {
+        gnutls_openpgp_keyring_deinit(sc->pgp_list);
+        sc->pgp_list = NULL;
+    }
+
     if (sc->priorities)
     {
@@ -497 +513 @@
 
     /* Load the PGP key file */
-    if (sc->pgp_key_file) {
+    if (sc->pgp_key_file && sc->privkey_pgp == NULL)
+    {
         if (load_datum_from_file(spool, sc->pgp_key_file, &data) != 0) {
             ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s,
@@ -573 +590 @@
 
     /* Load the keyring file */
-    if (sc->pgp_ring_file)
+    if (sc->pgp_ring_file && sc->pgp_list == NULL)
     {
         if (load_datum_from_file(spool, sc->pgp_ring_file, &data) != 0) {
@@ -1048 +1065 @@
 
     sc->privkey_x509 = NULL;
-    sc->privkey_pgp = NULL;
     sc->anon_creds = NULL;
 #ifdef ENABLE_SRP
@@ -1057 +1073 @@
     sc->p11_modules = NULL;
     sc->pin = NULL;
+
+    sc->privkey_pgp = NULL;
+#if GNUTLS_VERSION_NUMBER < 0x030312
+    sc->privkey_pgp_internal = NULL;
+#endif
+    sc->pgp_list = NULL;
+
     sc->priorities_str = NULL;
     sc->cache_timeout = -1;     /* -1 means "unset" */