enhance tls-verify possibility
PATCH v2 1/1 enhance tls-verify possibility
From: Mathieu GIANNECCHINI <[email protected]...>
It should be nice to enhance tls-verify check possibilities against peer cert during a pending TLS connection like :
- OCSP verification
- check any X509 extensions of the peer certificate
- delta CRL verification
- ...
This patch add a new "tls-export-cert" option which allow to get peer certificate in PEM format and to store it in an openvpn temporary file. Peer certificate is stored before tls-script execution and deleted after. The name of the related temporary file is available under tls-verify script by an environment variable "peer_cert".
The patch was made from OpenVPN svn Beta21 branches.
Here is a very simple exemple of Tls-verify script which provide OCSP support to OpenVPN (with tls-export-cert option) without any OpenVPN "core" modification :
X509=$2
openssl ocsp \
-issuer /etc/openvpn/ssl.crt/RootCA.pem \
-CAfile /etc/openvpn/ssl.capath/OpenVPNServeur-cafile.pem \
-cert $peer_cert \
-url http://your-ocsp-url
if [ $? -ne 0 ]
then
echo "error : OCSP check failed for ${X509}" | logger -t"tls-verify"
exit 1
fi
This patch has been modified by David Sommerseth, by fixing a few issues which came up to during the code review process. The man page has been updated and tmp_file in ssl.c is checked for not being NULL before calling delete_file().
--- init.c | 1 + openvpn.8 | 13 +++++++++++++ options.c | 10 ++++++++++ options.h | 1 + ssl.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ssl.h | 1 + 6 files changed, 87 insertions(+), 0 deletions(-)
init.c +1 -0
@@ -1805,6 +1805,7 @@ do_init_crypto_tls (struct context *c, const unsigned int flags)#endif to.verify_command = options->tls_verify; + to.verify_export_cert = options->tls_export_cert; to.verify_x509name = options->tls_remote; to.crl_file = options->crl_file; to.ns_cert_type = options->ns_cert_type;
openvpn.8 +13 -0
@@ -4258,6 +4258,14 @@ to to build a command line which will be passed to the script. .\"********************************************************* .TP +.B --tls-export-cert directory +Store the certificates the clients uses upon connection to this +directory. This will be done before --tls-verify is called. The +certificates will use a temporary name and will be deleted when +the tls-verify script returns. The file name used for the certificate +is available via the peer_cert environment variable. +.\"********************************************************* +.TP .B --tls-remote name Accept connections only from a host with X509 name or common name equal to
@@ -5242,6 +5250,11 @@ than their names as denoted on the command line or configuration file. .\"********************************************************* .TP +.B peer_cert +Temporary file name containing the client certificate upon +connection. Useful in conjunction with --tls-verify +.\"********************************************************* +.TP .B script_context Set to "init" or "restart" prior to up/down script execution. For more information, see
options.c +10 -0
@@ -529,6 +529,9 @@ static const char usage_message[] =" tests of certification. cmd should return 0 to allow\n" " TLS handshake to proceed, or 1 to fail. (cmd is\n" " executed as 'cmd certificate_depth X509_NAME_oneline')\n" +"--tls-export-cert [directory] : Get peer cert in PEM format and store it \n" +" in an openvpn temporary file in [directory]. Peer cert is \n" +" stored before tls-verify script execution and deleted after.\n" "--tls-remote x509name: Accept connections only from a host with X509 name\n" " x509name. The remote host must also pass all other tests\n" " of verification.\n"
@@ -1325,6 +1328,7 @@ show_settings (const struct options *o)#endif SHOW_STR (cipher_list);SHOW_STR (tls_verify); +SHOW_STR (tls_export_cert);SHOW_STR (tls_remote);SHOW_STR (crl_file);SHOW_INT (ns_cert_type);
@@ -1914,6 +1918,7 @@ options_postprocess_verify_ce (const struct options *options, const struct conneMUST_BE_UNDEF (pkcs12_file);MUST_BE_UNDEF (cipher_list);MUST_BE_UNDEF (tls_verify); +MUST_BE_UNDEF (tls_export_cert);MUST_BE_UNDEF (tls_remote);MUST_BE_UNDEF (tls_timeout);MUST_BE_UNDEF (renegotiate_bytes);
@@ -5525,6 +5530,11 @@ add_option (struct options *options, goto err; options->tls_verify =string_substitute (p[1 ],',' ,' ' , &options->gc); } +else if (streq (p[0 ],"tls-export-cert" ) && p[1 ]) + { +VERIFY_PERMISSION (OPT_P_GENERAL ); + options->tls_export_cert = p[1 ]; + }else if (streq (p[0 ],"tls-remote" ) && p[1 ]) {VERIFY_PERMISSION (OPT_P_GENERAL );
options.h +1 -0
@@ -440,6 +440,7 @@ struct optionsconst char *pkcs12_file;const char *cipher_list;const char *tls_verify; +const char *tls_export_cert;const char *tls_remote;const char *crl_file;
ssl.c +61 -0
83 lines not on this page · raw message
ssl.h +1 -0
@@ -441,6 +441,7 @@ struct tls_options/* cert verification parms */ const char *verify_command; +const char *verify_export_cert;const char *verify_x509name;const char *crl_file;int ns_cert_type;
Signature · 1 line
1.6.6.1
Hi,
Quoted 8 lines · David Sommerseth
From: Mathieu GIANNECCHINI <[email protected]...>
It should be nice to enhance tls-verify check possibilities against peer cert during a pending TLS connection like :
- OCSP verification
- check any X509 extensions of the peer certificate
- delta CRL verification
- ...
ACK.
gert
Signature · 4 lines
USENET is *not* the non-clickable part of WWW!
//www.muc.de/~gert/
Gert Doering - Munich, Germany [email protected]...
fax: +49-89-35655025 [email protected]...David Sommerseth
Applied-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 41 lines · David Sommerseth
From: Mathieu GIANNECCHINI <[email protected]...>
It should be nice to enhance tls-verify check possibilities against peer cert during a pending TLS connection like :
- OCSP verification
- check any X509 extensions of the peer certificate
- delta CRL verification
- ...This patch add a new "tls-export-cert" option which allow to get peer certificate in PEM format and to store it in an openvpn temporary file. Peer certificate is stored before tls-script execution and deleted after. The name of the related temporary file is available under tls-verify script by an environment variable "
peer_cert".The patch was made from OpenVPN svn Beta21 branches.
Here is a very simple exemple of Tls-verify script which provide OCSP support to OpenVPN (with tls-export-cert option) without any OpenVPN "core" modification :
X509=$2
openssl ocsp \ -issuer /etc/openvpn/ssl.crt/RootCA.pem \ -CAfile /etc/openvpn/ssl.capath/OpenVPNServeur-cafile.pem \ -cert $peer_cert \ -url http://your-ocsp-url if [ $? -ne 0 ] then echo "error : OCSP check failed for ${X509}" | logger -t"tls-verify"
exit 1
fiThis patch has been modified by David Sommerseth, by fixing a few issues which came up to during the code review process. The man page has been updated and
tmp_fileinssl.cis checked for not being NULL before callingdelete_file().Signed-off-by David Sommerseth <[email protected]...>
Quoted 9 lines
--- init.c | 1 + openvpn.8 | 13 +++++++++++++ options.c | 10 ++++++++++ options.h | 1 + ssl.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ssl.h | 1 + 6 files changed, 87 insertions(+), 0 deletions(-)
Applied to the feat_misc branch, to be merged into to allmerged. Commit a3982181e284f8c5c8fc15bbbd670da4d91a2ba9
kind regards,
David Sommerseth
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/
iEYEARECAAYFAkuNeboACgkQDC186MBRfrp52gCfdcomtlYoswujXdrig+zNQxjk lpQAni83Sopl7NEcK0/mxFAK8J2Ude2O
=Lf0Q
-----END PGP SIGNATURE-----