From a75cc71d2cbe4279097a1f6cd5267a2b7cfdf0f6 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Mon, 8 Oct 2018 21:13:30 +0100
Subject: [PATCH] Add openconnect_set_key_password()

For auto-provisioning via NetworkManager it's actually quite useful to be
able to set vpninfo->cert_password and have that special case handled,
instead of having to inject the password into the user's keyring somehow.

It's either that or revise the FSID hack...

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---
 libopenconnect.map.in | 1 +
 library.c             | 7 +++++++
 openconnect.h         | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/libopenconnect.map.in b/libopenconnect.map.in
index 9b0b86c7..38204b7a 100644
--- a/libopenconnect.map.in
+++ b/libopenconnect.map.in
@@ -99,6 +99,7 @@ OPENCONNECT_5_5 {
 	openconnect_get_supported_protocols;
 	openconnect_free_supported_protocols;
 	openconnect_has_tss2_blob_support;
+	openconnect_set_key_password;
 } OPENCONNECT_5_4;
 
 OPENCONNECT_PRIVATE {
diff --git a/library.c b/library.c
index eb657ded..7516f1a9 100644
--- a/library.c
+++ b/library.c
@@ -655,6 +655,13 @@ void openconnect_set_cert_expiry_warning(struct openconnect_info *vpninfo,
 	vpninfo->cert_expire_warning = seconds;
 }
 
+int openconnect_set_key_password(struct openconnect_info *vpninfo, const char *pass)
+{
+	STRDUP(vpninfo->cert_password, pass);
+
+	return 0;
+}
+
 void openconnect_set_pfs(struct openconnect_info *vpninfo, unsigned val)
 {
 	vpninfo->pfs = val;
diff --git a/openconnect.h b/openconnect.h
index eab45f3a..02c19930 100644
--- a/openconnect.h
+++ b/openconnect.h
@@ -37,6 +37,7 @@ extern "C" {
 
 /*
  * API version 5.5:
+ *  - add openconnect_set_key_password()
  *  - Add openconnect_has_tss2_blob_support()
  *  - Add openconnect_get_supported_protocols()
  *  - Add openconnect_free_supported_protocols()
@@ -513,6 +514,7 @@ int openconnect_set_mobile_info(struct openconnect_info *vpninfo,
 				const char *mobile_device_uniqueid);
 int openconnect_set_client_cert(struct openconnect_info *, const char *cert,
 				const char *sslkey);
+int openconnect_set_key_password(struct openconnect_info *vpninfo, const char *pass);
 const char *openconnect_get_ifname(struct openconnect_info *);
 void openconnect_set_reqmtu(struct openconnect_info *, int reqmtu);
 void openconnect_set_dpd(struct openconnect_info *, int min_seconds);