ssl: enable basic ecdsa
PATCH 1/1 ssl: enable basic ecdsa
From: Jan Just Keijser <[email protected]...>
Discussion: https://forums.openvpn.net/topic8404-30.html
--- src/openvpn/ssl_openssl.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
src/openvpn/ssl_openssl.c +11 -0
@@ -309,6 +309,7 @@ tls_ctx_load_dh_params (struct tls_root_ctx *ctx, const char *dh_file, {DH *dh;BIO *bio; +EC_KEY *ecdh=NULL ;ASSERT (NULL != ctx);
@@ -336,6 +337,16 @@ tls_ctx_load_dh_params (struct tls_root_ctx *ctx, const char *dh_file, 8 * DH_size (dh));DH_free (dh); + + ecdh =EC_KEY_new_by_curve_name (NID_secp224r1); + +if (ecdh ==NULL ) +msg (M_SSLERR ,"Unable to create curve (NID_secp224r1)" ); + +if (!SSL_CTX_set_tmp_ecdh (ctx->ctx, ecdh)) +msg (M_SSLERR ,"SSL_CTX_set_tmp_ecdh" ); + +EC_KEY_free (ecdh); }int
Signature · 1 line
1.8.3.2
Hi,
I re-send this patch as it proved to be somewhat helpful.
It will be great to reach to a level it can be actually used.
I guess configuration option should be added to make it optional and remove the hard coded curve?
Regards,
Alon Bar-Lev.
Quoted 40 lines · Alon Bar-Lev
From: Jan Just Keijser <[email protected]...>
Discussion: https://forums.openvpn.net/topic8404-30.html
Tested-by Sanaullah <[email protected]...>--- src/openvpn/ssl_openssl.c | 11 +++++++++++ 1 file changed, 11 insertions(+)src/openvpn/ssl_openssl.c +11
-1@@ -309,6 +309,7 @@ tls_ctx_load_dh_params (struct tls_root_ctx *ctx, const char *dh_file, {DH *dh;BIO *bio; +EC_KEY *ecdh=NULL ;ASSERT (NULL != ctx);@@ -336,6 +337,16 @@ tls_ctx_load_dh_params (struct tls_root_ctx *ctx, const char *dh_file, 8 * DH_size (dh));DH_free (dh); + + ecdh =EC_KEY_new_by_curve_name (NID_secp224r1); + +if (ecdh ==NULL ) +msg (M_SSLERR ,"Unable to create curve (NID_secp224r1)" ); + +if (!SSL_CTX_set_tmp_ecdh (ctx->ctx, ecdh)) +msg (M_SSLERR ,"SSL_CTX_set_tmp_ecdh" ); + +EC_KEY_free (ecdh); }int --1.8.3.2
there was actually a follow-up to this patch, which was sent to the openvpn-devel list on Feb 7th 2012:
Added support for Elliptic curves (ECDSA) + SHA2 family signed certificates.
---
init.c | 7 ++++ options.c | 15 ++++++++++ options.h | 6 ++++ ssl.c | 3 ++ ssl_backend.h | 10 ++++++ ssl_openssl.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ssl_polarssl.c | 9 ++++++ 7 files changed, 134 insertions(+), 0 deletions(-)
init.c +0 -0
@@ -895,6 +895,9 @@ print_openssl_info (const struct options *options) if (options->show_ciphers || options->show_digests || options->show_engines
#ifdef USE_SSL
|| options->show_tls_ciphers
+#ifdef USE_SSL_EC
+|| options->show_curves
+#endif
#endif
)
{
@@ -907,6 +910,10 @@ print_openssl_info (const struct options *options)
#ifdef USE_SSL
if (options->show_tls_ciphers)
show_available_tls_ciphers ();+#ifdef USE_SSL_EC
+ if (options->show_curves)
+ show_available_curves ();
+#endif
#endif
return true;
}options.c +0 -0
@@ -836,6 +836,9 @@ init_options (struct options *o, const bool init_gc)
#ifdef ENABLE_X509ALTUSERNAME
o->x509_username_field = X509_USERNAME_FIELD_DEFAULT;
#endif
+#ifdef USE_SSL_EC
+ o->curve_name = NULL;
+#endif
#endif /* USE_SSL */
#endif /* USE_CRYPTO */
#ifdef ENABLE_PKCS11
@@ -6368,6 +6371,18 @@ add_option (struct options *options,
VERIFY_PERMISSION (OPT_P_GENERAL);
options->show_tls_ciphers = true;
}+#ifdef USE_SSL_EC
+ else if (streq (p[0], "show-curves"))
+ {
+ VERIFY_PERMISSION (OPT_P_GENERAL);
+ options->show_curves = true;
+ }
+ else if (streq (p[0], "ecdh") && p[1])
+ {
+ VERIFY_PERMISSION (OPT_P_CRYPTO);
+ options->curve_name= p[1];
+ }
+#endif
else if (streq (p[0], "tls-server"))
{
VERIFY_PERMISSION (OPT_P_GENERAL);options.h +0 -0
@@ -200,6 +200,9 @@ struct optionsbool show_engines;
#ifdef USE_SSL
bool show_tls_ciphers;
+#ifdef USE_SSL_EC
+ bool show_curves;
+#endif
#endif
bool genkey;
#endif
@@ -533,6 +536,9 @@ struct options
const char *priv_key_file;
const char *pkcs12_file;
const char *cipher_list;
+#ifdef USE_SSL_EC
+ const char *curve_name;
+#endif
const char *tls_verify;
const char *tls_export_cert;
const char *tls_remote;
ssl.c +3 -0
@@ -308,6 +308,9 @@ init_ssl (const struct options *options, struct tls_root_ctx *new_ctx) {tls_ctx_server_new (new_ctx);tls_ctx_load_dh_params (new_ctx, options->dh_file, options->dh_file_inline); +#ifdef USE_SSL_EC +tls_ctx_load_ecdh_params (new_ctx, options->curve_name); +#endif } else /* if client */ {
ssl_backend.h +0 -0
@@ -145,6 +145,16 @@ void tls_ctx_load_dh_params(struct tls_root_ctx *ctx, const char *dh_file );
/**
+ * Load Elliptic Curve Parameters, and load them into the library-specific
+ * TLS context.
+ *
+ * @param ctx TLS context to use
+ * @param curve_name The name of the elliptic curve to load.
+ */
+void tls_ctx_load_ecdh_params(struct tls_root_ctx *ctx, const char *curve_name
+ );
+
+/**
* Load PKCS #12 file for key, cert and (optionally) CA certs, and add to
* library-specific TLS context.
*
ssl_openssl.c +0 -0
@@ -50,6 +50,9 @@
#include <openssl/pkcs12.h>
#include <openssl/x509.h>
#include <openssl/crypto.h>
+#ifdef USE_SSL_EC
+#include <openssl/ec.h>
+#endif
/*
* Allocate space in SSL objects in which to store a struct tls_session
@@ -238,6 +241,46 @@ tls_ctx_load_dh_params (struct tls_root_ctx *ctx, const char *dh_file
DH_free (dh);
}
+void
+tls_ctx_load_ecdh_params (struct tls_root_ctx *ctx, const char *curve_name
+ )
+{
+#ifdef USE_SSL_EC
+ if (curve_name != NULL)
+ {
+ int nid;
+ EC_KEY *ecdh = NULL;
+ + nid = OBJ_sn2nid(curve_name); + + if (nid == 0)
+ msg(M_SSLERR, "unknown curve name (%s)", curve_name);
+ else
+ {
+ ecdh = EC_KEY_new_by_curve_name(nid);
+ if (ecdh == NULL)
+ msg (M_SSLERR, "Unable to create curve (%s)", curve_name);
+ else
+ {
+ const char *sname;
+ + if (!SSL_CTX_set_tmp_ecdh(ctx->ctx, ecdh))
+ msg (M_SSLERR, "SSL_CTX_set_tmp_ecdh: cannot add curve");
+ + /* Translate NID back to name , just for kicks */
+ sname = OBJ_nid2sn(nid); + if (sname == NULL) sname = "(Unknown)"; + msg (D_TLS_DEBUG_LOW, "ECDH curve %s added", sname);
+ + EC_KEY_free(ecdh);
+ }
+ }
+ }
+#else
+ msg(M_SSLERR, "Elliptic Curves not supported by this version of OpenSSL"); +#endif
+}
+
int
tls_ctx_load_pkcs12(struct tls_root_ctx *ctx, const char *pkcs12_file, #if ENABLE_INLINE_FILES
@@ -1273,6 +1316,47 @@ show_available_tls_ciphers ()
SSL_CTX_free (ctx);
}
+/*
+ * * Show the Elliptic curves that are available for us to use
+ * * in the OpenSSL library.
+ * */
+#ifdef USE_SSL_EC
+void
+show_available_curves()
+{
+ EC_builtin_curve *curves = NULL; + size_t crv_len = 0; + size_t n = 0;
+
+ crv_len = EC_get_builtin_curves(NULL, 0);
+
+ curves = OPENSSL_malloc((int)(sizeof(EC_builtin_curve) * crv_len)); +
+ if (curves == NULL)
+ msg (M_SSLERR, "Cannot create EC_builtin_curve object");
+ else
+ {
+ if (EC_get_builtin_curves(curves, crv_len))
+ {
+ printf ("Available Elliptic curves:\n");
+ for (n = 0; n < crv_len; n++)
+ {
+ const char *sname;
+ sname = OBJ_nid2sn(curves[n].nid);
+ if (sname == NULL) sname = "";
+
+ printf("%s\n", sname);
+ }
+ }
+ else
+ {+ msg (M_SSLERR, "Cannot get list of builtin curves");
+ }
+ OPENSSL_free(curves);
+ }
+}
+#endif
+
voidget_highest_preference_tls_cipher (char *buf, int size) {
ssl_polarssl.c +0 -0
@@ -218,6 +218,15 @@ else (counter_type) 8 * mpi_size(&ctx->dhm_ctx->P));
}
+#ifdef USE_SSL_EC
+void
+tls_ctx_load_ecdh_params (struct tls_root_ctx *ctx, const char *curve_name
+ )
+{
+ msg(M_WARN, "Elliptic Curves not yet supported by PolarSSL");
+}
+#endif
+
int
tls_ctx_load_pkcs12(struct tls_root_ctx *ctx, const char *pkcs12_file, #if ENABLE_INLINE_FILES
-- 1.7.4.4
Quoted 55 lines · Alon Bar-Lev
Hi,
I re-send this patch as it proved to be somewhat helpful.
It will be great to reach to a level it can be actually used.
I guess configuration option should be added to make it optional and remove the hard coded curve?
Regards,
Alon Bar-Lev.Quoted 41 lines · Alon Bar-Lev
From: Jan Just Keijser <[email protected]...>
Discussion: https://forums.openvpn.net/topic8404-30.html
Tested-by Sanaullah <[email protected]...>--- src/openvpn/ssl_openssl.c | 11 +++++++++++ 1 file changed, 11 insertions(+)src/openvpn/ssl_openssl.c +11
-1@@ -309,6 +309,7 @@ tls_ctx_load_dh_params (struct tls_root_ctx *ctx, const char *dh_file, {DH *dh;BIO *bio; +EC_KEY *ecdh=NULL ;ASSERT (NULL != ctx);@@ -336,6 +337,16 @@ tls_ctx_load_dh_params (struct tls_root_ctx *ctx, const char *dh_file, 8 * DH_size (dh));DH_free (dh); + + ecdh =EC_KEY_new_by_curve_name (NID_secp224r1); + +if (ecdh ==NULL ) +msg (M_SSLERR ,"Unable to create curve (NID_secp224r1)" ); + +if (!SSL_CTX_set_tmp_ecdh (ctx->ctx, ecdh)) +msg (M_SSLERR ,"SSL_CTX_set_tmp_ecdh" ); + +EC_KEY_free (ecdh); }int --1.8.3.2
Quoted 6 lines · Jan Just Keijser
there was actually a follow-up to this patch, which was sent to the openvpn-devel list on Feb 7th 2012:
Added support for Elliptic curves (ECDSA) + SHA2 family signed certificates.
Great!
And what is the status?
Quoted 6 lines · Alon Bar-Lev
Quoted 4 lines · Jan Just Keijser
there was actually a follow-up to this patch, which was sent to the openvpn-devel list on Feb 7th 2012:
Quoted 8 lines
Quoted 3 lines
Added support for Elliptic curves (ECDSA) + SHA2 family signed certificates.
Great!
And what is the status?
it was not included as this patch does not provide full Elliptic curve (EC) support - it only allows a user to use ECDSA+SHA2 signed certs, nothing more , nothing less. The Control Channel will use ECDSA, the data channel is still encrypted and signed using AES and SHA1/SHA2.
JJK
Quoted 18 lines · Jan Just Keijser
Alon Bar-Lev wrote:
On Tue, Nov 12, 2013 at 1:37 PM, Jan Just Keijser <[email protected]...> wrote:
there was actually a follow-up to this patch, which was sent to the openvpn-devel list on Feb 7th 2012:
Added support for Elliptic curves (ECDSA) + SHA2 family signed certificates.
Great!
And what is the status?
Quoted 7 lines
it was not included as this patch does not provide full Elliptic curve (EC) support - it only allows a user to use ECDSA+SHA2 signed certs, nothing more , nothing less. The Control Channel will use ECDSA, the data channel is still encrypted and signed using AES and SHA1/SHA2.
JJK
But this is progress compared to current inability to use EC certificates at all, right?
Quoted 25 lines · Alon Bar-Lev
Quoted 23 lines · Jan Just Keijser
Alon Bar-Lev wrote:
On Tue, Nov 12, 2013 at 1:37 PM, Jan Just Keijser <[email protected]...> wrote:
there was actually a follow-up to this patch, which was sent to the openvpn-devel list on Feb 7th 2012:
Added support for Elliptic curves (ECDSA) + SHA2 family signed certificates.
Great!
And what is the status?
it was not included as this patch does not provide full Elliptic curve (EC) support - it only allows a user to use ECDSA+SHA2 signed certs, nothing more , nothing less. The Control Channel will use ECDSA, the data channel is still encrypted and signed using AES and SHA1/SHA2.
Quoted 8 lines
Quoted 3 lines
JJK
But this is progress compared to current inability to use EC certificates at all, right?
correct , although you can currently use EC certs with SHA1 signing - just not with SHA2 signing.
JJK
Hi,
Quoted 4 lines · Jan Just Keijser
correct , although you can currently use EC certs with SHA1 signing - just not with SHA2 signing.
JJK
Which means adding SHA2 hashing is at least a nice addition. I've taken a quick peak at the code, applied the patches to master (which was not that hard, considering it's been quite some time since these have been published) and did some quick tests. The code seems to work, and I'm planning to take a better look at it later this week. This patch gives me a nice starting point.
In the mean time the people at PolarSSL have also added an elliptic curve implementation to their library. I've been working on making OpenVPN work with PolarSSL 1.3, which seems to at least have brought support for ECDHE without adding extra logic to OpenVPN. If time permits I'll also take a look at getting ECDSA working. Patches will follow as soon as I'm a bit more confident that the code really works.
It would be very nice to get full EC support in OpenVPN! :)
-Steffan
Hi,
Quoted 1 line · Steffan Karger
It would be very nice to get full EC support in OpenVPN! :)
Indeed!