More free_pass() for TPMv1 passwords

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
sailfishos-mirror · Dec 21, 2018 · 442f911 · 442f911
1 parent c8df16b
commit 442f911
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/gnutls_tpm.c b/gnutls_tpm.c
@@ -184,7 +184,7 @@ int load_tpm1_key(struct openconnect_info *vpninfo, gnutls_datum_t *fdata,
 			goto out_srkpol;
 		}
 
-		free(pass);
+		free_pass(&pass);
 
 		/* ... we get it here instead. */
 		err = Tspi_Context_LoadKeyByBlob(vpninfo->tpm1->tpm_context, vpninfo->tpm1->srk,
@@ -244,7 +244,7 @@ int load_tpm1_key(struct openconnect_info *vpninfo, gnutls_datum_t *fdata,
 		err = Tspi_Policy_SetSecret(vpninfo->tpm1->tpm_key_policy,
 					    TSS_SECRET_MODE_PLAIN,
 					    strlen(pass), (void *)pass);
-		free(pass);
+		free_pass(&pass);
 
 		if (err) {
 			vpn_progress(vpninfo, PRG_ERR,

diff --git a/openssl.c b/openssl.c
@@ -616,8 +616,7 @@ static int load_tpm_certificate(struct openconnect_info *vpninfo,
 				     _("Failed to set TPM SRK password\n"));
 			openconnect_report_ssl_errors(vpninfo);
 		}
-		vpninfo->cert_password = NULL;
-		free(vpninfo->cert_password);
+		free_pass(&vpninfo->cert_password);
 	}
 
 	/* Provide our own UI method to handle the PIN callback. */