From: "plaisthos (Code Review)" Date: Wed, 6 Dec 2023 14:04:16 +0000 In-Reply-To: References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., gert@...1296... Message-ID: <053b51812b9dca83afb0fb1e4ad6628763512693-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="bdTfW3oHRG8="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: Implement the --tls-export-cert feature List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: cron2 , openvpn-devel --bdTfW3oHRG8= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello flichtenheld, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/466?usp=3Demail to look at the new patch set (#2). Change subject: Implement the --tls-export-cert feature ...................................................................... Implement the --tls-export-cert feature This is a re-implementation of the --tls-export-cert feature. This was necessary to due to missing approval to re-license the old (now removed) code. The re-implementation is based on the following description of the feature provided by David: Add an option to export certificate in PEM format of the remote peer to a given directory. For example: --tls-export-cert /var/tmp This option should use a randomised filename, which is provided via a "peer_cert" environment variable for the --tls-verify script or the OPENVPN_PLUGIN_TLS_VERIFY plug-in hook. Once the script or plugin call has completed, OpenVPN should delete this file. Change-Id: Ia9b3f1813d2d0d492d17c87348b4cebd0bf19ce2 Signed-off-by: Arne Schwabe --- M doc/man-sections/script-options.rst M src/openvpn/init.c M src/openvpn/options.c M src/openvpn/options.h M src/openvpn/ssl_common.h M src/openvpn/ssl_verify.c M src/openvpn/ssl_verify_backend.h M src/openvpn/ssl_verify_mbedtls.c M src/openvpn/ssl_verify_openssl.c 9 files changed, 152 insertions(+), 4 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/66/466/2 diff --git a/doc/man-sections/script-options.rst b/doc/man-sections/script-= options.rst index 38dcfa2..26b5434 100644 --- a/doc/man-sections/script-options.rst +++ b/doc/man-sections/script-options.rst @@ -423,6 +423,15 @@ See the `Environmental Variables`_ section below for additional parameters passed as environmental variables. +--tls-export-cert-path dir + Adds a an environment variables ``peer_cert_{x}`` (and an alias + ``peer_cert`` for ``peer_cert_0`` for compatibility) when calling the + ``--tls-verify`` script or executing the OPENVPN_PLUGIN_TLS_VERIFY plugin + hook to verify the certificate. + + The environment variable contains the path to a PEM encoded certificate + of the current peer certificate in the directory ``dir``. + --up cmd Run command ``cmd`` after successful TUN/TAP device open (pre ``--user`` UID change). @@ -763,6 +772,14 @@ modifier is specified, and deleted from the environment after the scri= pt returns. +:code:`peer_cert_{n}` + If the option ``--tls-export-cert`` is enabled, this option contains + the path to the current peer certificate to be verified in PEM format + where ``n`` is the verification level. + +:code:`peer_cert` identical to `peer_cert_0` for compatibility with older + versions. + :code:`proto` The ``--proto`` parameter. Set on program initiation and reset on SIGHUP. diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 9e2b3845..917ae33 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -3336,6 +3336,7 @@ to.auth_user_pass_verify_script_via_file =3D options->auth_user_pass_v= erify_script_via_file; to.client_crresponse_script =3D options->client_crresponse_script; to.tmp_dir =3D options->tmp_dir; + to.export_peer_cert_dir =3D options->tls_export_peer_cert_path; if (options->ccd_exclusive) { to.client_config_dir_exclusive =3D options->client_config_dir; diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 1521872..503e832 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -1986,6 +1986,7 @@ SHOW_STR(cipher_list_tls13); SHOW_STR(tls_cert_profile); SHOW_STR(tls_verify); + SHOW_STR(tls_export_peer_cert_path); SHOW_INT(verify_x509_type); SHOW_STR(verify_x509_name); SHOW_STR_INLINE(crl_file); @@ -3048,6 +3049,7 @@ MUST_BE_UNDEF(cipher_list_tls13); MUST_BE_UNDEF(tls_cert_profile); MUST_BE_UNDEF(tls_verify); + MUST_BE_UNDEF(tls_export_peer_cert_path); MUST_BE_UNDEF(verify_x509_name); MUST_BE_UNDEF(tls_timeout); MUST_BE_UNDEF(renegotiate_bytes); @@ -4053,6 +4055,13 @@ R_OK, "--crl-verify"); } + if (options->tls_export_peer_cert_path) + { + errs |=3D check_file_access_chroot(options->chroot_dir, CHKACC_FIL= E, + options->tls_export_peer_cert_pat= h, + W_OK, "--tls-export-cert"); + } + ASSERT(options->connection_list); for (int i =3D 0; i < options->connection_list->len; ++i) { @@ -8998,6 +9007,11 @@ string_substitute(p[1], ',', ' ', &options->gc), "tls-verify", true); } + else if (streq(p[0], "tls-export-cert") && p[1] && !p[2]) + { + VERIFY_PERMISSION(OPT_P_SCRIPT); + options->tls_export_peer_cert_path =3D p[1]; + } else if (streq(p[0], "compat-names")) { VERIFY_PERMISSION(OPT_P_GENERAL); diff --git a/src/openvpn/options.h b/src/openvpn/options.h index c4514e1..3b9a7f6 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -592,6 +592,7 @@ const char *tls_cert_profile; const char *ecdh_curve; const char *tls_verify; + const char *tls_export_peer_cert_path; int verify_x509_type; const char *verify_x509_name; const char *crl_file; diff --git a/src/openvpn/ssl_common.h b/src/openvpn/ssl_common.h index 925660b..f085e0d 100644 --- a/src/openvpn/ssl_common.h +++ b/src/openvpn/ssl_common.h @@ -374,6 +374,7 @@ const char *client_crresponse_script; bool auth_user_pass_verify_script_via_file; const char *tmp_dir; + const char *export_peer_cert_dir; const char *auth_user_pass_file; bool auth_user_pass_file_inline; diff --git a/src/openvpn/ssl_verify.c b/src/openvpn/ssl_verify.c index bd7e512..263b6d4 100644 --- a/src/openvpn/ssl_verify.c +++ b/src/openvpn/ssl_verify.c @@ -457,6 +457,32 @@ gc_free(&gc); } +static bool +verify_cert_cert_export_env(struct env_set *es, openvpn_x509_cert_t *peer_= cert, + int cert_depth, const char *pem_export_fn) +{ + char envname[64]; + struct gc_arena gc =3D gc_new(); + /* export the certificate itself as pem when the enabled */ + openvpn_snprintf(envname, sizeof(envname), "peer_cert_%d", cert_depth); + setenv_str(es, envname, pem_export_fn); + + /* compatibility with older scripts/plugins that expect peer_cert with= out + * suffix */ + if (cert_depth =3D=3D 0) + { + setenv_str(es, "peer_cert", pem_export_fn); + } + + bool ret =3D true; + + ret =3D (backend_x509_write_pem(peer_cert, pem_export_fn) =3D=3D SUCCE= SS); + + gc_free(&gc); + return ret; +} + + /* * call --tls-verify plug-in(s) */ @@ -572,18 +598,19 @@ result_t verify_cert(struct tls_session *session, openvpn_x509_cert_t *cert, int ce= rt_depth) { + /* need to define these variables here so goto cleanup will always have + * these variables defined */ result_t ret =3D FAILURE; - char *subject =3D NULL; - const struct tls_options *opt; struct gc_arena gc =3D gc_new(); + const char *pem_export_fn =3D NULL; - opt =3D session->opt; + const struct tls_options *opt =3D session->opt; ASSERT(opt); session->verified =3D false; /* get the X509 name */ - subject =3D x509_get_subject(cert, &gc); + char *subject =3D x509_get_subject(cert, &gc); if (!subject) { msg(D_TLS_ERRORS, "VERIFY ERROR: depth=3D%d, could not extract X50= 9 " @@ -706,6 +733,19 @@ session->verify_maxlevel =3D max_int(session->verify_maxlevel, cert_de= pth); + if (opt->export_peer_cert_dir) + { + pem_export_fn =3D platform_create_temp_file(opt->export_peer_cert_= dir, + "pef", &gc); + + if (!pem_export_fn + || !verify_cert_cert_export_env(opt->es, cert, cert_depth, pem= _export_fn)) + { + msg(D_TLS_ERRORS, "TLS Error: Failed to export certificate for= " + "--tls-export-cert in %s", opt->export_peer_cert_dir); + goto cleanup; + } + } /* export certificate values to the environment */ verify_cert_set_env(opt->es, cert, cert_depth, subject, common_name, opt->x509_track); @@ -763,6 +803,11 @@ tls_clear_error(); /* always? */ session->verified =3D false; /* double sure? */ } + if (pem_export_fn) + { + platform_unlink(pem_export_fn); + } + gc_free(&gc); return ret; diff --git a/src/openvpn/ssl_verify_backend.h b/src/openvpn/ssl_verify_back= end.h index d402b1f..5301a51 100644 --- a/src/openvpn/ssl_verify_backend.h +++ b/src/openvpn/ssl_verify_backend.h @@ -161,6 +161,17 @@ struct gc_arena *gc); /* + * Write the certificate to the file in PEM format. + * + * + * @param cert Certificate to serialise. + * + * @return \c FAILURE, \c or SUCCESS + */ +result_t backend_x509_write_pem(openvpn_x509_cert_t *cert, + const char *filename); + +/* * Save X509 fields to environment, using the naming convention: * * X509_{cert_depth}_{name}=3D{value} diff --git a/src/openvpn/ssl_verify_mbedtls.c b/src/openvpn/ssl_verify_mbed= tls.c index 5612139..a48526e 100644 --- a/src/openvpn/ssl_verify_mbedtls.c +++ b/src/openvpn/ssl_verify_mbedtls.c @@ -218,6 +218,41 @@ return buf; } +result_t +backend_x509_write_pem(openvpn_x509_cert_t *cert, const char *filename) +{ + /* mbed TLS does not make it easy to write a certificate in PEM format. + * The only way to is directly access the DER encoded raw certificate + * and PEM encode it ourselves */ + + struct gc_arena gc =3D gc_new(); + /* just do a very loose upper bound for the base64 based PEM encoding + * using needing 3 times the space for the base64 and 100 bytes for the + * headers and footer */ + struct buffer pem =3D alloc_buf_gc(cert->raw.len * 3 + 100, &gc); + + struct buffer der =3D {}; + buf_set_read(&der, cert->raw.p, cert->raw.len); + + if (!crypto_pem_encode("CERTIFICATE", &pem, &der, &gc)) + { + goto err; + } + + if (!buffer_write_file(filename, &pem)) + { + goto err; + } + + gc_free(&gc); + return SUCCESS; +err: + msg(D_TLS_DEBUG_LOW, "Error writing X509 certificate to file %s", + filename); + gc_free(&gc); + return FAILURE; +} + static struct buffer x509_get_fingerprint(const mbedtls_md_info_t *md_info, mbedtls_x509_crt *c= ert, struct gc_arena *gc) diff --git a/src/openvpn/ssl_verify_openssl.c b/src/openvpn/ssl_verify_open= ssl.c index 5afffc1..00fdec3 100644 --- a/src/openvpn/ssl_verify_openssl.c +++ b/src/openvpn/ssl_verify_openssl.c @@ -320,6 +320,29 @@ return format_hex_ex(asn1_i->data, asn1_i->length, 0, 1, ":", gc); } +result_t +backend_x509_write_pem(openvpn_x509_cert_t *cert, const char *filename) +{ + BIO *out =3D BIO_new_file(filename, "w"); + if (!out) + { + goto err; + } + + if (!PEM_write_bio_X509(out, cert)) + { + goto err; + } + BIO_free(out); + + return SUCCESS; +err: + BIO_free(out); + crypto_msg(D_TLS_DEBUG_LOW, "Error writing X509 certificate to file %s= ", + filename); + return FAILURE; +} + struct buffer x509_get_sha1_fingerprint(X509 *cert, struct gc_arena *gc) { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/466?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ia9b3f1813d2d0d492d17c87348b4cebd0bf19ce2 Gerrit-Change-Number: 466 Gerrit-PatchSet: 2 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: cron2 Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --bdTfW3oHRG8= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

plaisthos uploaded patch set #2 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/466?usp=3Demail">View Chang= e

Implement the --tls-export-cert feature

This is a re-implement= ation of the --tls-export-cert feature. This
was necessary to due to mis= sing approval to re-license the old
(now removed) code. The re-implement= ation is based on the following
description of the feature provided by D= avid:

Add an option to export certificate in PEM format of the rem= ote
peer to a given directory.

For example: --tls-export-cert= /var/tmp

This option should use a randomised filename, which is p= rovided via a
"peer_cert" environment variable for the --tls= -verify script or the
OPENVPN_PLUGIN_TLS_VERIFY plug-in hook.

O= nce the script or plugin call has completed, OpenVPN should delete
this = file.

Change-Id: Ia9b3f1813d2d0d492d17c87348b4cebd0bf19ce2
Signed= -off-by: Arne Schwabe <arne@...1227...>
---
M doc/man-sections/= script-options.rst
M src/openvpn/init.c
M src/openvpn/options.c
M = src/openvpn/options.h
M src/openvpn/ssl_common.h
M src/openvpn/ssl_ve= rify.c
M src/openvpn/ssl_verify_backend.h
M src/openvpn/ssl_verify_mb= edtls.c
M src/openvpn/ssl_verify_openssl.c
9 files changed, 152 inser= tions(+), 4 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/=
openvpn refs/changes/66/466/2
diff --git a/doc/man-sections/script-=
options.rst b/doc/man-sections/script-options.rst
index 38d= cfa2..26b5434 100644
--- a/doc/man-sections/script-options.= rst
+++ b/doc/man-sections/script-options.rst
@@ -423,6 +423,15 @@
See the `Environmental Variables= `_ section below for additional
parameters passed as env= ironmental variables.

+--tls-export-cert-path dir
+ Adds a an environment variables ``peer_cert_{x= }`` (and an alias
+ = ``peer_cert`` for ``peer_cert_0`` for compatibility) when calling the
+ ``--tls-verify`` scrip= t or executing the OPENVPN_PLUGIN_TLS_VERIFY plugin
+ hook to verify the certificate.<= br>+
+ The environment variable contains the path t= o a PEM encoded certificate
+ of the current peer certificate in the directory ``dir``.<= br>+
--up cmd<= /span>
Run command ``cmd`` after successful TUN/TAP device open= (pre ``--user``
UID change).
@@ -763,6 = +772,14 @@
modifier is specified, and deleted from the= environment after the script
returns.

+:code:`peer_cert_= {n}`
+ If the opti= on ``--tls-export-cert`` is enabled, this option contains
+ the path to the current peer cert= ificate to be verified in PEM format
+ where ``n`` is the verification level.
+

+:code:`peer_cert` identical to `peer_cert_0` for compa= tibility with older
+= versions.
+
:code:`proto`
The ``--proto`` parameter. S= et on program initiation and reset on
SIGHUP.diff --git a/src/openvpn/init.c b/src/openvpn/init.c
index 9e2b3845..917ae33 100644

--- a/src/openvpn/init.c
+++ b/src/openvpn/init.c
@@ -3336,6 +3336,7 = @@
to.auth_user_pass_verify_script_via_file =3D option= s->auth_user_pass_verify_script_via_file;
to.client= _crresponse_script =3D options->client_crresponse_script;
to.tmp_dir =3D options->tmp_dir;

+ to.export_peer_cert_dir =3D options->tls_expo= rt_peer_cert_path;
if (options->ccd_exclusive)
{
to.client_config_dir_exclusive = =3D options->client_config_dir;
diff --git a/src/openvpn= /options.c b/src/openvpn/options.c
index 1521872..503e832 1= 00644
--- a/src/openvpn/options.c
+++ b/src= /openvpn/options.c
@@ -1986,6 +1986,7 @@
= SHOW_STR(cipher_list_tls13);
SHOW_STR(tls_cert_prof= ile);
SHOW_STR(tls_verify);
+ SHOW_STR(tls_export_peer_cert_path);
SHOW_INT(verify_x509_type);
SHOW_STR(v= erify_x509_name);
SHOW_STR_INLINE(crl_file);@@ -3048,6 +3049,7 @@
MUST_BE_UNDEF(cipher_= list_tls13);
MUST_BE_UNDEF(tls_cert_profile);
MUST_BE_UNDEF(tls_verify);
+ MUST_BE_UNDEF(tls_export_peer_cert_path= );
MUST_BE_UNDEF(verify_x509_name);
MUST_BE_UNDEF(tls_timeout);

MUST_BE_UND= EF(renegotiate_bytes);
@@ -4053,6 +4055,13 @@
R_OK, "--crl-verif= y");

}

+ if (options->tls_export_peer_cert_pat= h)
+ {
<= span style=3D"color: hsl(120, 100%, 40%);">+ errs |=3D check_file_ac= cess_chroot(options->chroot_dir, CHKACC_FILE,

+ optio= ns->tls_export_peer_cert_path,
+ W_OK, "--tls-ex= port-cert");
+ = }
+
ASSERT(options->connection_list);
for (int i = =3D 0; i < options->connection_list->len; ++i)
= {
@@ -8998,6 +9007,11 @@
= string_substitute(p[1], ',', ' ', &options->= ;gc),
"tls-verify", true= );
}
+ else if (streq(p[0], "tls-export-cert") && p[1]= && !p[2])
+ = {
+ VERIFY_= PERMISSION(OPT_P_SCRIPT);
+ options->tls_export_peer_cert_path =3D p[1];
+ }
else i= f (streq(p[0], "compat-names"))
{
= VERIFY_PERMISSION(OPT_P_GENERAL);
diff --git= a/src/openvpn/options.h b/src/openvpn/options.h
index c451= 4e1..3b9a7f6 100644
--- a/src/openvpn/options.h
<= span>+++ b/src/openvpn/options.h
@@ -592,6 +592,7 @@=
const char *tls_cert_profile;
const cha= r *ecdh_curve;
const char *tls_verify;
+ const char *tls_export_peer_cer= t_path;
int verify_x509_type;
con= st char *verify_x509_name;
const char *crl_file;

diff --git a/src/openvpn/ssl_common.h b/src/openvpn/ssl_common.h=
index 925660b..f085e0d 100644
--- a/src/op= envpn/ssl_common.h
+++ b/src/openvpn/ssl_common.h@@ -374,6 +374,7 @@
const char *client_crrespon= se_script;
bool auth_user_pass_verify_script_via_file;=
const char *tmp_dir;
+ const char *export_peer_cert_dir;
const char *auth_user_pass_file;
bool auth_user= _pass_file_inline;

diff --git a/src/openv= pn/ssl_verify.c b/src/openvpn/ssl_verify.c
index bd7e512..2= 63b6d4 100644
--- a/src/openvpn/ssl_verify.c
+++ b/src/openvpn/ssl_verify.c
@@ -457,6 +457,32 @@

gc_free(&gc);
}

+static bool
+verify_cert_cert_export_env(stru= ct env_set *es, openvpn_x509_cert_t *peer_cert,

+ int cert_depth, con= st char *pem_export_fn)
+{
+ char envna= me[64];
+ struct g= c_arena gc =3D gc_new();
+ /* export the certificate itself as pem when the enabled */=
+ openvpn_snprintf(envna= me, sizeof(envname), "peer_cert_%d", cert_depth);
+ setenv_str(es, envname, pem_exp= ort_fn);
+
= + /* compatibility with olde= r scripts/plugins that expect peer_cert without
+ * suffix */
+ if (cert_depth =3D=3D 0)
+ {
+ setenv_str(es, "peer_cert", pem_expor= t_fn);
+ }<= br>+
+ bool ret =3D true;
+
+ ret =3D (backend_x509_write_pem(peer_cert, pem_export_fn= ) =3D=3D SUCCESS);
+<= /span>
+ gc_free(&gc)= ;
+ return ret;
+}
+
+
/*
* call --tls-verify = plug-in(s)
*/
@@ -572,18 +598,19 @@

result_t
verify_cert(struct tls_session *sessi= on, openvpn_x509_cert_t *cert, int cert_depth)
{+ /* need to define these v= ariables here so goto cleanup will always have
+ * these variables defined */
result_t ret =3D FAILURE;
- char *subject =3D NULL;
- const struct tls_options *opt;
st= ruct gc_arena gc =3D gc_new();
+ const char *pem_export_fn =3D NULL;
=
- opt =3D session->opt;=
+ const struct tl= s_options *opt =3D session->opt;
ASSERT(opt);

session->verified =3D false;
/* get the X509 name */
- subject =3D x509_get_subject(cert, &= ;gc);
+ char *subj= ect =3D x509_get_subject(cert, &gc);
if (!subject)=
{
msg(D_TLS_ERRORS, "VE= RIFY ERROR: depth=3D%d, could not extract X509 "
@@ -7= 06,6 +733,19 @@

session->verify_m= axlevel =3D max_int(session->verify_maxlevel, cert_depth);

+ if (opt->= ;export_peer_cert_dir)
+ pem= _export_fn =3D platform_create_temp_file(opt->export_peer_cert_dir,

+ = "pef", &gc);
+
+ if (!pem_export_fn
+ || !verify_cert_cert_export_env(opt->e= s, cert, cert_depth, pem_export_fn))
+ {
+ msg(D_TLS_ERRORS, "TLS Error: Failed to export cert= ificate for "
+ = "--tls-export-cert in %s", opt->export_peer_cer= t_dir);
+ = goto cleanup;
+ = }
+ }
= /* export certificate values to the environment */
verify_cert_set_env(opt->es, cert, cert_depth, subject, common_n= ame,
opt->x509_track);@@ -763,6 +803,11 @@
tls_clear_error(); /*= always? */
session->verified =3D false; /* dou= ble sure? */
}
+ if (pem_export_fn)
+ {
+ platform_unlink(pem_export_fn);
+ }
+
gc_free(&gc);
=
return ret;
diff --git a/src/openvpn/ssl_ver= ify_backend.h b/src/openvpn/ssl_verify_backend.h
index d402= b1f..5301a51 100644
--- a/src/openvpn/ssl_verify_backend.h<= /span>
+++ b/src/openvpn/ssl_verify_backend.h
@@ -= 161,6 +161,17 @@
struct = gc_arena *gc);

/*
+ * Write the certificate to the file in P= EM format.
+ *=
+ *
+ * @param cert Certificate to se= rialise.
+ *+ * @return \c F= AILURE, \c or SUCCESS
+ */
+result_t backe= nd_x509_write_pem(openvpn_x509_cert_t *cert,
+ const char *filena= me);
+
+/*

* Save X509 f= ields to environment, using the naming convention:
*
* X509_{cert_depth}_{name}=3D{value}
diff --g= it a/src/openvpn/ssl_verify_mbedtls.c b/src/openvpn/ssl_verify_mbedtls.c
index 5612139..a48526e 100644
--- a/src/openv= pn/ssl_verify_mbedtls.c
+++ b/src/openvpn/ssl_verify_mbedtl= s.c
@@ -218,6 +218,41 @@
return buf;
}

+result_t
+backend_x509_write_pem(openvpn_x509_cert_t *cert, const char *filename= )
+{
+ /* mbed TLS does not make it eas= y to write a certificate in PEM format.
+ * The only way to is directly access the DER encod= ed raw certificate
+ = * and PEM encode it ourselves */
+
+ = struct gc_arena gc =3D gc_new();
+ /* just do a very loose upper bound for the base64 based= PEM encoding
+ *= using needing 3 times the space for the base64 and 100 bytes for the
+ * headers and footer= */
+ struct buffe= r pem =3D alloc_buf_gc(cert->raw.len * 3 + 100, &gc);
+

+ struct buffer der =3D {};
+ buf_set_read(&der, cert->raw.p= , cert->raw.len);
= +
+ if (!crypto_pe= m_encode("CERTIFICATE", &pem, &der, &gc))
= + {
+ goto err;
+ }
+
+ = if (!buffer_write_file(filename, &pem))
+ {
+ goto err;
+ }
+
+ gc_free(&gc);

+ return SUCCESS;

+err:
+ msg(D_TLS_DEBUG_LOW, "Error w= riting X509 certificate to file %s",
+ filename);
+ gc_free(&gc);
+ return FAILURE;
+}
+
static struct buffer
x509_get_finge= rprint(const mbedtls_md_info_t *md_info, mbedtls_x509_crt *cert,
= struct gc_arena *gc)
diff --git= a/src/openvpn/ssl_verify_openssl.c b/src/openvpn/ssl_verify_openssl.c
index 5afffc1..00fdec3 100644
--- a/src/openvpn= /ssl_verify_openssl.c
+++ b/src/openvpn/ssl_verify_openssl.= c
@@ -320,6 +320,29 @@
return format_h= ex_ex(asn1_i->data, asn1_i->length, 0, 1, ":", gc);<= br> }

+result_t
+b= ackend_x509_write_pem(openvpn_x509_cert_t *cert, const char *filename)
+{
+ BIO *out =3D BIO_new_file(filename, &= quot;w");
+ i= f (!out)
+ {
+ goto err;<= br>+ }
+
+ if (!PEM_write_bio_X509(out, cert))
+ {
+ goto err;
+ }
+ BIO_free(out);
+
+ return SUCC= ESS;
+err:
= + BIO_free(out);
<= span style=3D"color: hsl(120, 100%, 40%);">+ crypto_msg(D_TLS_DEBUG_LOW,= "Error writing X509 certificate to file %s",

+ filename);
+ return FAILURE;

+}

+
struct buffer
x5= 09_get_sha1_fingerprint(X509 *cert, struct gc_arena *gc)
{=

To view, visit change 466. To unsubscribe, = or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia9b3f1813d2d0d492d17c87348b= 4cebd0bf19ce2
Gerrit-Change-Number: 466
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: cron2 <gert@...1296...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newpatchset
--bdTfW3oHRG8=--