From 462f18c7b25fe3e467f837647d07ab0a78aa8d2b Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 22 Feb 2015 21:39:56 +0100 Subject: Merged origin/release (checked in because wanted to merge new stuff) --- openssl/crypto/engine/tb_ecdh.c | 84 ++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 39 deletions(-) (limited to 'openssl/crypto/engine/tb_ecdh.c') diff --git a/openssl/crypto/engine/tb_ecdh.c b/openssl/crypto/engine/tb_ecdh.c index c8ec7812c..c51441be8 100644 --- a/openssl/crypto/engine/tb_ecdh.c +++ b/openssl/crypto/engine/tb_ecdh.c @@ -21,7 +21,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -69,65 +69,71 @@ #include "eng_int.h" -/* If this symbol is defined then ENGINE_get_default_ECDH(), the function that is - * used by ECDH to hook in implementation code and cache defaults (etc), will - * display brief debugging summaries to stderr with the 'nid'. */ +/* + * If this symbol is defined then ENGINE_get_default_ECDH(), the function + * that is used by ECDH to hook in implementation code and cache defaults + * (etc), will display brief debugging summaries to stderr with the 'nid'. + */ /* #define ENGINE_ECDH_DEBUG */ static ENGINE_TABLE *ecdh_table = NULL; static const int dummy_nid = 1; void ENGINE_unregister_ECDH(ENGINE *e) - { - engine_table_unregister(&ecdh_table, e); - } +{ + engine_table_unregister(&ecdh_table, e); +} static void engine_unregister_all_ECDH(void) - { - engine_table_cleanup(&ecdh_table); - } +{ + engine_table_cleanup(&ecdh_table); +} int ENGINE_register_ECDH(ENGINE *e) - { - if(e->ecdh_meth) - return engine_table_register(&ecdh_table, - engine_unregister_all_ECDH, e, &dummy_nid, 1, 0); - return 1; - } +{ + if (e->ecdh_meth) + return engine_table_register(&ecdh_table, + engine_unregister_all_ECDH, e, + &dummy_nid, 1, 0); + return 1; +} void ENGINE_register_all_ECDH() - { - ENGINE *e; +{ + ENGINE *e; - for(e=ENGINE_get_first() ; e ; e=ENGINE_get_next(e)) - ENGINE_register_ECDH(e); - } + for (e = ENGINE_get_first(); e; e = ENGINE_get_next(e)) + ENGINE_register_ECDH(e); +} int ENGINE_set_default_ECDH(ENGINE *e) - { - if(e->ecdh_meth) - return engine_table_register(&ecdh_table, - engine_unregister_all_ECDH, e, &dummy_nid, 1, 1); - return 1; - } +{ + if (e->ecdh_meth) + return engine_table_register(&ecdh_table, + engine_unregister_all_ECDH, e, + &dummy_nid, 1, 1); + return 1; +} -/* Exposed API function to get a functional reference from the implementation +/* + * Exposed API function to get a functional reference from the implementation * table (ie. try to get a functional reference from the tabled structural - * references). */ + * references). + */ ENGINE *ENGINE_get_default_ECDH(void) - { - return engine_table_select(&ecdh_table, dummy_nid); - } +{ + return engine_table_select(&ecdh_table, dummy_nid); +} /* Obtains an ECDH implementation from an ENGINE functional reference */ const ECDH_METHOD *ENGINE_get_ECDH(const ENGINE *e) - { - return e->ecdh_meth; - } +{ + return e->ecdh_meth; +} /* Sets an ECDH implementation in an ENGINE structure */ int ENGINE_set_ECDH(ENGINE *e, const ECDH_METHOD *ecdh_meth) - { - e->ecdh_meth = ecdh_meth; - return 1; - } +{ + e->ecdh_meth = ecdh_meth; + return 1; +} -- cgit v1.2.3