From 91e3957fb0e38a5d5649f82e5d9f89dd0e85666f Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Sat, 28 Mar 2015 09:50:31 -0400 Subject: Update openssl to version openssl-1.0.1m Conflicts: openssl/Makefile openssl/Makefile.bak openssl/crypto/cryptlib.c --- openssl/ssl/ssl_utst.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'openssl/ssl/ssl_utst.c') diff --git a/openssl/ssl/ssl_utst.c b/openssl/ssl/ssl_utst.c index 3679bc3c2..53bdde330 100644 --- a/openssl/ssl/ssl_utst.c +++ b/openssl/ssl/ssl_utst.c @@ -1,5 +1,6 @@ /* ssl_utst.c */ -/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL +/* + * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ /* ==================================================================== @@ -10,7 +11,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 @@ -56,18 +57,16 @@ #ifndef OPENSSL_NO_UNIT_TEST - -static const struct openssl_ssl_test_functions ssl_test_functions = - { - ssl_init_wbio_buffer, - ssl3_setup_buffers, - tls1_process_heartbeat, - dtls1_process_heartbeat - }; +static const struct openssl_ssl_test_functions ssl_test_functions = { + ssl_init_wbio_buffer, + ssl3_setup_buffers, + tls1_process_heartbeat, + dtls1_process_heartbeat +}; const struct openssl_ssl_test_functions *SSL_test_functions(void) - { - return &ssl_test_functions; - } +{ + return &ssl_test_functions; +} #endif -- cgit v1.2.3