From: Chris J Arges Date: Mon, 4 Mar 2013 09:56:04 -0600 Message-Id: <1362412564-26583-1-git-send-email-chris.j.arges@...1808...> In-Reply-To: <51273023.4040400@...1147...> References: <51273023.4040400@...1147...> MIME-Version: 1.0 Subject: [Openvpn-devel] [PATCH v2] Add auto value to pkcs11-id parameter List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: openvpn-devel@lists.sourceforge.net Cc: o.dumschat@...1809... This patch allows one to specify --pkcs11-id auto to automatically select the first certificate on a pkcs11 device. This simplifies scripts and usage in environments where clients may only use a single certificate for connecting to a VPN. Based on a patch by Oliver Dumschat-Hötte. Reported-by: Oliver Dumschat-Hötte Signed-off-by: Chris J Arges --- doc/openvpn.8 | 7 +++++++ src/openvpn/pkcs11.c | 41 +++++++++++++++++++++++++++++++++-------- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/doc/openvpn.8 b/doc/openvpn.8 index 829bbd2..84e38dd 100644 --- a/doc/openvpn.8 +++ b/doc/openvpn.8 @@ -4228,6 +4228,13 @@ Specify the serialized certificate id to be used. The id can be gotten by the standalone .B \-\-show-pkcs11-ids option. +If +.B name +is specified as the string +.B 'auto' +, then certificate id 0 will be used. This +is useful in single user cases; however, care should be taken to ensure the correct +certificate is selected. .\"********************************************************* .TP .B \-\-pkcs11-id-management diff --git a/src/openvpn/pkcs11.c b/src/openvpn/pkcs11.c index 3a15ef6..11d5e8f 100644 --- a/src/openvpn/pkcs11.c +++ b/src/openvpn/pkcs11.c @@ -669,14 +669,39 @@ tls_ctx_use_pkcs11 ( } } else { - if ( - (rv = pkcs11h_certificate_deserializeCertificateId ( - &certificate_id, - pkcs11_id - )) != CKR_OK - ) { - msg (M_WARN, "PKCS#11: Cannot deserialize id %ld-'%s'", rv, pkcs11h_getMessage (rv)); - goto cleanup; + if ( strcmp(pkcs11_id, "auto") == 0 ) { + char *pkcs11_id_read = NULL; + char *base64 = NULL; + if ( !pkcs11_management_id_get( + 0, + &pkcs11_id_read, + &base64 + ) + ) { + msg (M_WARN, "PKCS#11: pkcs11_management_id_get 0 failed"); + goto cleanup; + } + if ( + (rv = pkcs11h_certificate_deserializeCertificateId ( + &certificate_id, + pkcs11_id_read + )) != CKR_OK + ) { + msg (M_WARN, "PKCS#11: Cannot deserialize auto id %ld-'%s'", rv, + pkcs11h_getMessage (rv)); + goto cleanup; + } + } else { + if ( + (rv = pkcs11h_certificate_deserializeCertificateId ( + &certificate_id, + pkcs11_id + )) != CKR_OK + ) { + msg (M_WARN, "PKCS#11: Cannot deserialize id %ld-'%s'", rv, + pkcs11h_getMessage (rv)); + goto cleanup; + } } } -- 1.7.9.5