From c3cbddecb50dd54773bcfeca3a4d10c6361a3f22 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 14 Dec 2018 11:03:02 +0000 Subject: [PATCH] ECDH: Fix whitespace, permissions --- 3rdparty/everest/include/everest/everest.h | 0 3rdparty/everest/include/everest/x25519.h | 0 3rdparty/everest/library/everest.c | 3 ++- 3rdparty/everest/library/x25519.c | 0 include/mbedtls/config.h | 2 +- include/mbedtls/ecdh.h | 2 +- library/ecdh.c | 0 library/ecdsa.c | 0 library/ecp.c | 0 programs/test/benchmark.c | 2 +- 10 files changed, 5 insertions(+), 4 deletions(-) mode change 100755 => 100644 3rdparty/everest/include/everest/everest.h mode change 100755 => 100644 3rdparty/everest/include/everest/x25519.h mode change 100755 => 100644 3rdparty/everest/library/everest.c mode change 100755 => 100644 3rdparty/everest/library/x25519.c mode change 100755 => 100644 library/ecdh.c mode change 100755 => 100644 library/ecdsa.c mode change 100755 => 100644 library/ecp.c mode change 100755 => 100644 programs/test/benchmark.c diff --git a/3rdparty/everest/include/everest/everest.h b/3rdparty/everest/include/everest/everest.h old mode 100755 new mode 100644 diff --git a/3rdparty/everest/include/everest/x25519.h b/3rdparty/everest/include/everest/x25519.h old mode 100755 new mode 100644 diff --git a/3rdparty/everest/library/everest.c b/3rdparty/everest/library/everest.c old mode 100755 new mode 100644 index 4b3a799dc..2e2422f3e --- a/3rdparty/everest/library/everest.c +++ b/3rdparty/everest/library/everest.c @@ -107,4 +107,5 @@ int mbedtls_everest_calc_secret( mbedtls_ecdh_context_everest *ctx, size_t *olen return mbedtls_x25519_calc_secret( x25519_ctx, olen, buf, blen, f_rng, p_rng ); } -#endif /* MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED */ \ No newline at end of file +#endif /* MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED */ + diff --git a/3rdparty/everest/library/x25519.c b/3rdparty/everest/library/x25519.c old mode 100755 new mode 100644 diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h index ce00ca114..b91fa702b 100644 --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h @@ -2078,7 +2078,7 @@ */ //#define MBEDTLS_PLATFORM_GMTIME_R_ALT -/* +/** * \def MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED * * Enable the verified implementations of crypto primitives diff --git a/include/mbedtls/ecdh.h b/include/mbedtls/ecdh.h index 4bb704bc5..7f61c453c 100644 --- a/include/mbedtls/ecdh.h +++ b/include/mbedtls/ecdh.h @@ -43,7 +43,7 @@ #include "mbedtls/ecp.h" #if defined(MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED) -#undef MBEDTLS_ECDH_LEGACY_CONTEXT +#undef MBEDTLS_ECDH_LEGACY_CONTEXT #include "everest/everest.h" #endif diff --git a/library/ecdh.c b/library/ecdh.c old mode 100755 new mode 100644 diff --git a/library/ecdsa.c b/library/ecdsa.c old mode 100755 new mode 100644 diff --git a/library/ecp.c b/library/ecp.c old mode 100755 new mode 100644 diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c old mode 100755 new mode 100644 index ba2c9370a..a808a84b6 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -988,7 +988,7 @@ int main( int argc, char *argv[] ) } #endif -#if defined(MBEDTLS_ECDH_C) +#if defined(MBEDTLS_ECDH_C) if( todo.ecdh ) { mbedtls_ecdh_context ecdh_srv, ecdh_cli;