From 911b6f95f8b4bb5bd94d08a1e503e14dcd4c9a2f Mon Sep 17 00:00:00 2001 From: David Garske Date: Sun, 22 Oct 2017 15:58:35 -0700 Subject: [PATCH] Release v3.12.2 (lib 14.0.0). Updated copywright. --- IDE/GCC-ARM/Header/user_settings.h | 2 +- IDE/GCC-ARM/Source/benchmark_main.c | 2 +- .../Projects/benchmark/benchmark-main.c | 2 +- .../Projects/benchmark/current_time.c | 4 +- .../Projects/common/minimum-startup.c | 2 +- IDE/IAR-EWARM/Projects/test/test-main.c | 2 +- IDE/LPCXPRESSO/lib_wolfssl/lpc_18xx_port.c | 2 +- .../wolf_example/src/lpc_18xx_startup.c | 2 +- IDE/MDK-ARM/LPC43xx/time-LCP43xx.c | 66 +++++----- IDE/MDK-ARM/MDK-ARM/wolfSSL/cert_data.c | 2 +- .../MDK-ARM/wolfSSL/config-BARE-METAL.h | 12 +- IDE/MDK-ARM/MDK-ARM/wolfSSL/config-FS.h | 14 +-- .../MDK-ARM/wolfSSL/config-RTX-TCP-FS.h | 14 +-- IDE/MDK-ARM/MDK-ARM/wolfSSL/config.h | 2 +- IDE/MDK-ARM/MDK-ARM/wolfSSL/main.c | 28 ++--- IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c | 84 ++++++------- IDE/MDK-ARM/MDK-ARM/wolfSSL/time-CortexM3-4.c | 10 +- IDE/MDK-ARM/MDK-ARM/wolfSSL/time-dummy.c | 10 +- IDE/MDK-ARM/MDK-ARM/wolfSSL/wolfssl_MDK_ARM.c | 76 ++++++------ IDE/MDK-ARM/MDK-ARM/wolfSSL/wolfssl_MDK_ARM.h | 16 +-- .../STM32F2xx_StdPeriph_Lib/time-STM32F2xx.c | 2 +- IDE/MDK5-ARM/Conf/config-Crypt.h | 10 +- IDE/MDK5-ARM/Inc/config.h | 2 +- IDE/MDK5-ARM/Inc/wolfssl_MDK_ARM.h | 12 +- IDE/MDK5-ARM/Projects/CryptBenchmark/main.c | 14 +-- .../Projects/CryptBenchmark/time-CortexM3-4.c | 10 +- IDE/MDK5-ARM/Projects/CryptTest/main.c | 14 +-- .../Projects/EchoClient/config-EchoClient.h | 2 +- IDE/MDK5-ARM/Projects/EchoClient/main.c | 14 +-- IDE/MDK5-ARM/Projects/EchoServer/main.c | 12 +- .../SimpleClient/config-SimpleClient.h | 2 +- IDE/MDK5-ARM/Projects/SimpleClient/main.c | 24 ++-- .../Projects/SimpleClient/time-CortexM3-4.c | 10 +- .../SimpleServer/config-SimpleServer.h | 2 +- IDE/MDK5-ARM/Projects/SimpleServer/main.c | 20 +-- IDE/MDK5-ARM/Projects/wolfSSL-Full/main.c | 16 +-- IDE/MDK5-ARM/Projects/wolfSSL-Full/shell.c | 114 +++++++++--------- .../Projects/wolfSSL-Full/time-CortexM3-4.c | 10 +- IDE/MDK5-ARM/Src/ssl-dummy.c | 8 +- IDE/ROWLEY-CROSSWORKS-ARM/arm_startup.c | 10 +- IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c | 8 +- IDE/ROWLEY-CROSSWORKS-ARM/kinetis_hw.c | 16 +-- IDE/ROWLEY-CROSSWORKS-ARM/retarget.c | 2 +- IDE/ROWLEY-CROSSWORKS-ARM/test_main.c | 8 +- README | 53 ++++++++ README.md | 52 ++++++++ configure.ac | 6 +- ctaocrypt/src/misc.c | 2 +- ctaocrypt/src/wolfcrypt_first.c | 2 +- ctaocrypt/src/wolfcrypt_last.c | 2 +- cyassl/callbacks.h | 2 +- cyassl/crl.h | 2 +- cyassl/ctaocrypt/aes.h | 2 +- cyassl/ctaocrypt/arc4.h | 2 +- cyassl/ctaocrypt/asn.h | 2 +- cyassl/ctaocrypt/asn_public.h | 2 +- cyassl/ctaocrypt/blake2-impl.h | 2 +- cyassl/ctaocrypt/blake2-int.h | 2 +- cyassl/ctaocrypt/blake2.h | 2 +- cyassl/ctaocrypt/camellia.h | 2 +- cyassl/ctaocrypt/chacha.h | 2 +- cyassl/ctaocrypt/coding.h | 2 +- cyassl/ctaocrypt/compress.h | 2 +- cyassl/ctaocrypt/des3.h | 2 +- cyassl/ctaocrypt/dh.h | 2 +- cyassl/ctaocrypt/dsa.h | 2 +- cyassl/ctaocrypt/ecc.h | 2 +- cyassl/ctaocrypt/error-crypt.h | 2 +- cyassl/ctaocrypt/fips_test.h | 2 +- cyassl/ctaocrypt/hc128.h | 2 +- cyassl/ctaocrypt/hmac.h | 2 +- cyassl/ctaocrypt/integer.h | 2 +- cyassl/ctaocrypt/logging.h | 2 +- cyassl/ctaocrypt/md2.h | 2 +- cyassl/ctaocrypt/md4.h | 2 +- cyassl/ctaocrypt/md5.h | 2 +- cyassl/ctaocrypt/memory.h | 2 +- cyassl/ctaocrypt/misc.h | 2 +- cyassl/ctaocrypt/mpi_class.h | 2 +- cyassl/ctaocrypt/mpi_superclass.h | 2 +- cyassl/ctaocrypt/pkcs7.h | 2 +- cyassl/ctaocrypt/poly1305.h | 2 +- cyassl/ctaocrypt/port/pic32/pic32mz-crypt.h | 2 +- cyassl/ctaocrypt/pwdbased.h | 2 +- cyassl/ctaocrypt/rabbit.h | 2 +- cyassl/ctaocrypt/random.h | 2 +- cyassl/ctaocrypt/ripemd.h | 2 +- cyassl/ctaocrypt/rsa.h | 2 +- cyassl/ctaocrypt/settings.h | 30 ++--- cyassl/ctaocrypt/settings_comp.h | 2 +- cyassl/ctaocrypt/sha.h | 2 +- cyassl/ctaocrypt/sha256.h | 2 +- cyassl/ctaocrypt/sha512.h | 2 +- cyassl/ctaocrypt/tfm.h | 2 +- cyassl/ctaocrypt/types.h | 2 +- cyassl/ctaocrypt/visibility.h | 2 +- cyassl/ctaocrypt/wc_port.h | 2 +- cyassl/error-ssl.h | 2 +- cyassl/internal.h | 2 +- cyassl/ocsp.h | 2 +- cyassl/openssl/des.h | 4 +- cyassl/openssl/evp.h | 4 +- cyassl/openssl/hmac.h | 4 +- cyassl/openssl/ssl.h | 2 +- cyassl/options.h.in | 2 +- cyassl/sniffer.h | 2 +- cyassl/sniffer_error.h | 2 +- cyassl/ssl.h | 10 +- cyassl/version.h | 2 +- cyassl/version.h.in | 2 +- examples/client/client.c | 2 +- examples/client/client.h | 2 +- examples/echoclient/echoclient.c | 2 +- examples/echoclient/echoclient.h | 2 +- examples/echoserver/echoserver.c | 2 +- examples/echoserver/echoserver.h | 2 +- examples/sctp/sctp-client-dtls.c | 2 +- examples/sctp/sctp-client.c | 2 +- examples/sctp/sctp-server-dtls.c | 2 +- examples/sctp/sctp-server.c | 2 +- examples/server/server.h | 2 +- mcapi/crypto.c | 2 +- mcapi/crypto.h | 2 +- mcapi/mcapi_test.c | 2 +- mplabx/benchmark_main.c | 6 +- mplabx/test_main.c | 8 +- rpm/spec.in | 4 +- src/bio.c | 2 +- src/crl.c | 2 +- src/internal.c | 2 +- src/keys.c | 2 +- src/ocsp.c | 2 +- src/sniffer.c | 2 +- src/ssl.c | 2 +- src/tls.c | 2 +- src/tls13.c | 2 +- src/wolfio.c | 2 +- sslSniffer/sslSnifferTest/snifftest.c | 18 +-- swig/wolfssl.i | 2 +- swig/wolfssl_adds.c | 2 +- tests/api.c | 2 +- tests/hash.c | 2 +- tests/srp.c | 2 +- tests/suites.c | 2 +- tests/unit.c | 2 +- tests/unit.h | 2 +- testsuite/testsuite.c | 2 +- wolfcrypt/benchmark/benchmark.c | 2 +- wolfcrypt/benchmark/benchmark.h | 4 +- wolfcrypt/src/aes.c | 2 +- wolfcrypt/src/aes_asm.s | 2 +- wolfcrypt/src/arc4.c | 2 +- wolfcrypt/src/asm.c | 2 +- wolfcrypt/src/asn.c | 2 +- wolfcrypt/src/blake2b.c | 4 +- wolfcrypt/src/camellia.c | 2 +- wolfcrypt/src/chacha.c | 2 +- wolfcrypt/src/chacha20_poly1305.c | 2 +- wolfcrypt/src/cmac.c | 4 +- wolfcrypt/src/coding.c | 2 +- wolfcrypt/src/compress.c | 12 +- wolfcrypt/src/cpuid.c | 2 +- wolfcrypt/src/curve25519.c | 2 +- wolfcrypt/src/des3.c | 2 +- wolfcrypt/src/dh.c | 2 +- wolfcrypt/src/dsa.c | 2 +- wolfcrypt/src/ecc.c | 2 +- wolfcrypt/src/ed25519.c | 2 +- wolfcrypt/src/error.c | 2 +- wolfcrypt/src/evp.c | 2 +- wolfcrypt/src/fe_low_mem.c | 2 +- wolfcrypt/src/fe_operations.c | 2 +- wolfcrypt/src/fp_mont_small.i | 2 +- wolfcrypt/src/fp_mul_comba_12.i | 2 +- wolfcrypt/src/fp_mul_comba_17.i | 2 +- wolfcrypt/src/fp_mul_comba_20.i | 2 +- wolfcrypt/src/fp_mul_comba_24.i | 2 +- wolfcrypt/src/fp_mul_comba_28.i | 2 +- wolfcrypt/src/fp_mul_comba_3.i | 2 +- wolfcrypt/src/fp_mul_comba_32.i | 2 +- wolfcrypt/src/fp_mul_comba_4.i | 2 +- wolfcrypt/src/fp_mul_comba_48.i | 2 +- wolfcrypt/src/fp_mul_comba_6.i | 2 +- wolfcrypt/src/fp_mul_comba_64.i | 2 +- wolfcrypt/src/fp_mul_comba_7.i | 2 +- wolfcrypt/src/fp_mul_comba_8.i | 2 +- wolfcrypt/src/fp_mul_comba_9.i | 2 +- wolfcrypt/src/fp_mul_comba_small_set.i | 2 +- wolfcrypt/src/fp_sqr_comba_12.i | 2 +- wolfcrypt/src/fp_sqr_comba_17.i | 2 +- wolfcrypt/src/fp_sqr_comba_20.i | 2 +- wolfcrypt/src/fp_sqr_comba_24.i | 2 +- wolfcrypt/src/fp_sqr_comba_28.i | 2 +- wolfcrypt/src/fp_sqr_comba_3.i | 2 +- wolfcrypt/src/fp_sqr_comba_32.i | 2 +- wolfcrypt/src/fp_sqr_comba_4.i | 2 +- wolfcrypt/src/fp_sqr_comba_48.i | 2 +- wolfcrypt/src/fp_sqr_comba_6.i | 2 +- wolfcrypt/src/fp_sqr_comba_64.i | 2 +- wolfcrypt/src/fp_sqr_comba_7.i | 2 +- wolfcrypt/src/fp_sqr_comba_8.i | 2 +- wolfcrypt/src/fp_sqr_comba_9.i | 2 +- wolfcrypt/src/fp_sqr_comba_small_set.i | 2 +- wolfcrypt/src/ge_low_mem.c | 2 +- wolfcrypt/src/ge_operations.c | 2 +- wolfcrypt/src/hash.c | 2 +- wolfcrypt/src/hc128.c | 66 +++++----- wolfcrypt/src/hmac.c | 2 +- wolfcrypt/src/idea.c | 2 +- wolfcrypt/src/integer.c | 2 +- wolfcrypt/src/logging.c | 2 +- wolfcrypt/src/md2.c | 4 +- wolfcrypt/src/md4.c | 12 +- wolfcrypt/src/md5.c | 2 +- wolfcrypt/src/memory.c | 2 +- wolfcrypt/src/misc.c | 2 +- wolfcrypt/src/pkcs12.c | 2 +- wolfcrypt/src/pkcs7.c | 2 +- wolfcrypt/src/poly1305.c | 4 +- wolfcrypt/src/port/arm/armv8-aes.c | 2 +- wolfcrypt/src/port/arm/armv8-sha256.c | 2 +- wolfcrypt/src/port/atmel/atmel.c | 6 +- wolfcrypt/src/port/nrf51.c | 2 +- wolfcrypt/src/port/nxp/ksdk_port.c | 2 +- wolfcrypt/src/port/pic32/pic32mz-crypt.c | 2 +- wolfcrypt/src/port/ti/ti-aes.c | 110 ++++++++--------- wolfcrypt/src/port/ti/ti-ccm.c | 2 +- wolfcrypt/src/port/ti/ti-des3.c | 38 +++--- wolfcrypt/src/port/ti/ti-hash.c | 2 +- wolfcrypt/src/port/xilinx/xil-aesgcm.c | 2 +- wolfcrypt/src/port/xilinx/xil-sha3.c | 2 +- wolfcrypt/src/pwdbased.c | 2 +- wolfcrypt/src/rabbit.c | 2 +- wolfcrypt/src/random.c | 2 +- wolfcrypt/src/ripemd.c | 20 +-- wolfcrypt/src/rsa.c | 2 +- wolfcrypt/src/sha.c | 2 +- wolfcrypt/src/sha256.c | 2 +- wolfcrypt/src/sha3.c | 6 +- wolfcrypt/src/sha3_long.i | 2 +- wolfcrypt/src/sha512.c | 2 +- wolfcrypt/src/signature.c | 2 +- wolfcrypt/src/srp.c | 2 +- wolfcrypt/src/tfm.c | 2 +- wolfcrypt/src/wc_encrypt.c | 2 +- wolfcrypt/src/wc_port.c | 2 +- wolfcrypt/src/wolfevent.c | 2 +- wolfcrypt/src/wolfmath.c | 2 +- wolfcrypt/test/test.c | 2 +- wolfcrypt/test/test.h | 2 +- wolfcrypt/user-crypto/include/user_rsa.h | 2 +- wolfcrypt/user-crypto/src/rsa.c | 2 +- wolfssl/callbacks.h | 8 +- wolfssl/crl.h | 2 +- wolfssl/error-ssl.h | 2 +- wolfssl/internal.h | 2 +- wolfssl/ocsp.h | 2 +- wolfssl/openssl/aes.h | 2 +- wolfssl/openssl/des.h | 4 +- wolfssl/openssl/evp.h | 2 +- wolfssl/openssl/hmac.h | 4 +- wolfssl/openssl/ssl.h | 2 +- wolfssl/options.h.in | 2 +- wolfssl/sniffer.h | 2 +- wolfssl/sniffer_error.h | 2 +- wolfssl/ssl.h | 2 +- wolfssl/version.h | 6 +- wolfssl/version.h.in | 2 +- wolfssl/wolfcrypt/aes.h | 2 +- wolfssl/wolfcrypt/arc4.h | 2 +- wolfssl/wolfcrypt/asn.h | 2 +- wolfssl/wolfcrypt/asn_public.h | 2 +- wolfssl/wolfcrypt/blake2-impl.h | 2 +- wolfssl/wolfcrypt/blake2-int.h | 2 +- wolfssl/wolfcrypt/blake2.h | 2 +- wolfssl/wolfcrypt/camellia.h | 2 +- wolfssl/wolfcrypt/chacha.h | 2 +- wolfssl/wolfcrypt/chacha20_poly1305.h | 2 +- wolfssl/wolfcrypt/cmac.h | 2 +- wolfssl/wolfcrypt/coding.h | 2 +- wolfssl/wolfcrypt/compress.h | 2 +- wolfssl/wolfcrypt/cpuid.h | 2 +- wolfssl/wolfcrypt/curve25519.h | 2 +- wolfssl/wolfcrypt/des3.h | 2 +- wolfssl/wolfcrypt/dh.h | 2 +- wolfssl/wolfcrypt/dsa.h | 2 +- wolfssl/wolfcrypt/ecc.h | 2 +- wolfssl/wolfcrypt/ed25519.h | 2 +- wolfssl/wolfcrypt/error-crypt.h | 2 +- wolfssl/wolfcrypt/fe_operations.h | 2 +- wolfssl/wolfcrypt/fips_test.h | 2 +- wolfssl/wolfcrypt/ge_operations.h | 2 +- wolfssl/wolfcrypt/hash.h | 2 +- wolfssl/wolfcrypt/hc128.h | 2 +- wolfssl/wolfcrypt/hmac.h | 2 +- wolfssl/wolfcrypt/idea.h | 2 +- wolfssl/wolfcrypt/integer.h | 2 +- wolfssl/wolfcrypt/logging.h | 2 +- wolfssl/wolfcrypt/md2.h | 2 +- wolfssl/wolfcrypt/md4.h | 2 +- wolfssl/wolfcrypt/md5.h | 2 +- wolfssl/wolfcrypt/mem_track.h | 2 +- wolfssl/wolfcrypt/memory.h | 2 +- wolfssl/wolfcrypt/misc.h | 2 +- wolfssl/wolfcrypt/mpi_class.h | 2 +- wolfssl/wolfcrypt/mpi_superclass.h | 6 +- wolfssl/wolfcrypt/pkcs12.h | 2 +- wolfssl/wolfcrypt/pkcs7.h | 2 +- wolfssl/wolfcrypt/poly1305.h | 2 +- wolfssl/wolfcrypt/port/atmel/atmel.h | 6 +- wolfssl/wolfcrypt/port/nrf51.h | 2 +- wolfssl/wolfcrypt/port/nxp/ksdk_port.h | 2 +- wolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h | 2 +- wolfssl/wolfcrypt/port/ti/ti-ccm.h | 4 +- wolfssl/wolfcrypt/port/ti/ti-hash.h | 2 +- wolfssl/wolfcrypt/port/xilinx/xil-sha3.h | 2 +- wolfssl/wolfcrypt/pwdbased.h | 2 +- wolfssl/wolfcrypt/rabbit.h | 2 +- wolfssl/wolfcrypt/random.h | 2 +- wolfssl/wolfcrypt/ripemd.h | 2 +- wolfssl/wolfcrypt/rsa.h | 2 +- wolfssl/wolfcrypt/settings.h | 2 +- wolfssl/wolfcrypt/sha.h | 2 +- wolfssl/wolfcrypt/sha256.h | 2 +- wolfssl/wolfcrypt/sha3.h | 2 +- wolfssl/wolfcrypt/sha512.h | 2 +- wolfssl/wolfcrypt/signature.h | 2 +- wolfssl/wolfcrypt/srp.h | 2 +- wolfssl/wolfcrypt/tfm.h | 2 +- wolfssl/wolfcrypt/types.h | 2 +- wolfssl/wolfcrypt/visibility.h | 2 +- wolfssl/wolfcrypt/wc_encrypt.h | 2 +- wolfssl/wolfcrypt/wc_port.h | 2 +- wolfssl/wolfcrypt/wolfevent.h | 2 +- wolfssl/wolfcrypt/wolfmath.h | 2 +- wolfssl/wolfio.h | 2 +- 336 files changed, 923 insertions(+), 818 deletions(-) diff --git a/IDE/GCC-ARM/Header/user_settings.h b/IDE/GCC-ARM/Header/user_settings.h index 4b8b7f6af..55fb9b173 100755 --- a/IDE/GCC-ARM/Header/user_settings.h +++ b/IDE/GCC-ARM/Header/user_settings.h @@ -1,6 +1,6 @@ /* user_settings.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/IDE/GCC-ARM/Source/benchmark_main.c b/IDE/GCC-ARM/Source/benchmark_main.c index ffc62fd89..ed7b3ea04 100755 --- a/IDE/GCC-ARM/Source/benchmark_main.c +++ b/IDE/GCC-ARM/Source/benchmark_main.c @@ -1,6 +1,6 @@ /* benchmark_main.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/IDE/IAR-EWARM/Projects/benchmark/benchmark-main.c b/IDE/IAR-EWARM/Projects/benchmark/benchmark-main.c index 3b12b6f29..a901d88cd 100644 --- a/IDE/IAR-EWARM/Projects/benchmark/benchmark-main.c +++ b/IDE/IAR-EWARM/Projects/benchmark/benchmark-main.c @@ -1,6 +1,6 @@ /* benchmark-main.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/IDE/IAR-EWARM/Projects/benchmark/current_time.c b/IDE/IAR-EWARM/Projects/benchmark/current_time.c index 1c626f5ef..2d956ec74 100644 --- a/IDE/IAR-EWARM/Projects/benchmark/current_time.c +++ b/IDE/IAR-EWARM/Projects/benchmark/current_time.c @@ -1,6 +1,6 @@ /* current-time.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -53,7 +53,7 @@ void InitTimer(void) { static int initFlag = false ; double current_time(int reset) -{ +{ if(!initFlag)InitTimer() ; initFlag = true ; if(reset)ROM_TimerLoadSet(TIMER0_BASE, TIMER_A, -1); diff --git a/IDE/IAR-EWARM/Projects/common/minimum-startup.c b/IDE/IAR-EWARM/Projects/common/minimum-startup.c index 030914bfd..ff449c19b 100644 --- a/IDE/IAR-EWARM/Projects/common/minimum-startup.c +++ b/IDE/IAR-EWARM/Projects/common/minimum-startup.c @@ -1,6 +1,6 @@ /* minimum-startup.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/IDE/IAR-EWARM/Projects/test/test-main.c b/IDE/IAR-EWARM/Projects/test/test-main.c index 5d0930b71..cb9c63154 100644 --- a/IDE/IAR-EWARM/Projects/test/test-main.c +++ b/IDE/IAR-EWARM/Projects/test/test-main.c @@ -1,6 +1,6 @@ /* test-main.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/IDE/LPCXPRESSO/lib_wolfssl/lpc_18xx_port.c b/IDE/LPCXPRESSO/lib_wolfssl/lpc_18xx_port.c index 12fe6ff44..374993995 100644 --- a/IDE/LPCXPRESSO/lib_wolfssl/lpc_18xx_port.c +++ b/IDE/LPCXPRESSO/lib_wolfssl/lpc_18xx_port.c @@ -1,6 +1,6 @@ /* lpc_18xx_port.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/IDE/LPCXPRESSO/wolf_example/src/lpc_18xx_startup.c b/IDE/LPCXPRESSO/wolf_example/src/lpc_18xx_startup.c index 5b5006eae..59f7009d1 100644 --- a/IDE/LPCXPRESSO/wolf_example/src/lpc_18xx_startup.c +++ b/IDE/LPCXPRESSO/wolf_example/src/lpc_18xx_startup.c @@ -1,6 +1,6 @@ /* lpc_18xx_startup.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/IDE/MDK-ARM/LPC43xx/time-LCP43xx.c b/IDE/MDK-ARM/LPC43xx/time-LCP43xx.c index c481e177b..e8d80793a 100644 --- a/IDE/MDK-ARM/LPC43xx/time-LCP43xx.c +++ b/IDE/MDK-ARM/LPC43xx/time-LCP43xx.c @@ -1,6 +1,6 @@ /* time.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -19,25 +19,25 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + #ifdef HAVE_CONFIG_H #include #endif /*----------------------------------------------------------------------------- - * initialize RTC + * initialize RTC *----------------------------------------------------------------------------*/ #include #include "lpc43xx_rtc.h" #include "lpc43xx_cgu.h" -static void init_RTC() -{ +static void init_RTC() +{ /* Enable GPIO register interface clock */ LPC_CCU1->CLK_M4_GPIO_CFG |= 1; while (!(LPC_CCU1->CLK_M4_GPIO_STAT & 1)) ; - + /* RTC Block section ------------------------------------------------------ */ /* Init RTC module */ RTC_Init(LPC_RTC); @@ -53,13 +53,13 @@ static void init_RTC() /* Enable rtc (starts increase the tick counter and second counter register) */ RTC_Cmd(LPC_RTC, ENABLE); - + } /*----------------------------------------------------------------------------- * initialize TIM *----------------------------------------------------------------------------*/ - + #include "lpc43xx_timer.h" static void init_TIM() @@ -75,9 +75,9 @@ static void init_TIM() TIM_Cmd(LPC_TIMER2,ENABLE); } -double current_time() +double current_time() { - return (double)LPC_TIMER2->TC/1000000.0; + return (double)LPC_TIMER2->TC/1000000.0; } @@ -88,9 +88,9 @@ void init_time(void) { #include -struct tm *Cyassl_MDK_gmtime(const time_t *c) -{ - static struct tm date ; +struct tm *Cyassl_MDK_gmtime(const time_t *c) +{ + static struct tm date ; RTC_TIME_Type RTCFullTime; RTC_GetFullTime (LPC_RTC, &RTCFullTime); @@ -102,17 +102,17 @@ struct tm *Cyassl_MDK_gmtime(const time_t *c) date.tm_min = RTCFullTime.MIN ; date.tm_sec = RTCFullTime.SEC ; - #if defined(DEBUG_CYASSL) + #if defined(DEBUG_CYASSL) { extern void CYASSL_MSG(char *msg) ; char msg[100] ; sprintf(msg, "Debug::Cyassl_KEIL_gmtime(DATE=/%4d/%02d/%02d TIME=%02d:%02d:%02d)\n", RTCFullTime.YEAR+2000, RTCFullTime.MONTH, RTCFullTime.DOM, - RTCFullTime.HOUR, RTCFullTime.MIN, RTCFullTime.SEC) ; - CYASSL_MSG(msg) ; + RTCFullTime.HOUR, RTCFullTime.MIN, RTCFullTime.SEC) ; + CYASSL_MSG(msg) ; } #endif - + return(&date) ; } @@ -124,42 +124,42 @@ typedef struct func_args { #include -void time_main(void *args) +void time_main(void *args) { char * datetime ; int year ; RTC_TIME_Type RTCFullTime; - if( args == NULL || ((func_args *)args)->argc == 1) { + if( args == NULL || ((func_args *)args)->argc == 1) { RTC_GetFullTime (LPC_RTC, &RTCFullTime); - printf("Date: %d/%d/%d, Time: %02d:%02d:%02d\n", - RTCFullTime.MONTH, RTCFullTime.DOM, RTCFullTime.YEAR+2000, - RTCFullTime.HOUR, RTCFullTime.MIN, RTCFullTime.SEC) ; - } else if(((func_args *)args)->argc == 3 && - ((func_args *)args)->argv[1][0] == '-' && + printf("Date: %d/%d/%d, Time: %02d:%02d:%02d\n", + RTCFullTime.MONTH, RTCFullTime.DOM, RTCFullTime.YEAR+2000, + RTCFullTime.HOUR, RTCFullTime.MIN, RTCFullTime.SEC) ; + } else if(((func_args *)args)->argc == 3 && + ((func_args *)args)->argv[1][0] == '-' && ((func_args *)args)->argv[1][1] == 'd' ) { datetime = ((func_args *)args)->argv[2]; - sscanf(datetime, "%d/%d/%d", + sscanf(datetime, "%d/%d/%d", (int *)&RTCFullTime.MONTH, (int *)&RTCFullTime.DOM, &year) ; - RTCFullTime.YEAR = year - 2000 ; + RTCFullTime.YEAR = year - 2000 ; RTC_SetTime (LPC_RTC, RTC_TIMETYPE_MONTH, RTCFullTime.MONTH); RTC_SetTime (LPC_RTC, RTC_TIMETYPE_YEAR, RTCFullTime.YEAR); - RTC_SetTime (LPC_RTC, RTC_TIMETYPE_DAYOFMONTH, RTCFullTime.DOM); - } else if(((func_args *)args)->argc == 3 && - ((func_args *)args)->argv[1][0] == '-' && + RTC_SetTime (LPC_RTC, RTC_TIMETYPE_DAYOFMONTH, RTCFullTime.DOM); + } else if(((func_args *)args)->argc == 3 && + ((func_args *)args)->argv[1][0] == '-' && ((func_args *)args)->argv[1][1] == 't' ) { RTC_GetFullTime (LPC_RTC, &RTCFullTime); datetime = ((func_args *)args)->argv[2]; - sscanf(datetime, "%d:%d:%d", - (int *)&RTCFullTime.HOUR, - (int *)&RTCFullTime.MIN, + sscanf(datetime, "%d:%d:%d", + (int *)&RTCFullTime.HOUR, + (int *)&RTCFullTime.MIN, (int *)&RTCFullTime.SEC ) ; RTC_SetTime (LPC_RTC, RTC_TIMETYPE_SECOND, RTCFullTime.SEC); RTC_SetTime (LPC_RTC, RTC_TIMETYPE_MINUTE, RTCFullTime.MIN); RTC_SetTime (LPC_RTC, RTC_TIMETYPE_HOUR, RTCFullTime.HOUR); - } else printf("Invalid argument\n") ; + } else printf("Invalid argument\n") ; } diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/cert_data.c b/IDE/MDK-ARM/MDK-ARM/wolfSSL/cert_data.c index 313e64f64..96d0c2e95 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/cert_data.c +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/cert_data.c @@ -1,6 +1,6 @@ /* certs_test.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-BARE-METAL.h b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-BARE-METAL.h index e0f8ab925..43707c7c8 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-BARE-METAL.h +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-BARE-METAL.h @@ -1,6 +1,6 @@ /* config-BEREFOOT.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -72,7 +72,7 @@ // Crypt/Cipher Benchmark #define MDK_CONF_CTaoCryptBenchmark 1 #if MDK_CONF_CTaoCryptBenchmark == 0 -#define NO_CRYPT_BENCHMARK +#define NO_CRYPT_BENCHMARK #define BENCH_EMBEDDED #endif // @@ -120,10 +120,10 @@ #define WOLFSSL_SHA384 #endif // -// SHA-512 +// SHA-512 #define MDK_CONF_SHA512 0 #if MDK_CONF_SHA512 == 1 -#define WOLFSSL_SHA512 +#define WOLFSSL_SHA512 #endif // // RIPEMD @@ -151,7 +151,7 @@ #endif // -// AEAD +// AEAD #define MDK_CONF_AEAD 0 #if MDK_CONF_AEAD == 1 #define HAVE_AEAD @@ -178,7 +178,7 @@ #endif // // DSA -#define MDK_CONF_DSA 1 +#define MDK_CONF_DSA 1 #if MDK_CONF_DSA == 0 #define NO_DSA #endif diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-FS.h b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-FS.h index c3a746ae2..8bfbe2036 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-FS.h +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-FS.h @@ -1,6 +1,6 @@ /* config-FS.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -70,7 +70,7 @@ // Crypt/Cipher Benchmark #define MDK_CONF_CTaoCryptBenchmark 1 #if MDK_CONF_CTaoCryptBenchmark == 0 -#define NO_CRYPT_BENCHMARK +#define NO_CRYPT_BENCHMARK #endif // // @@ -97,7 +97,7 @@ // SSL (Included by default) // -// TLS +// TLS #define MDK_CONF_TLS 1 #if MDK_CONF_TLS == 0 #define NO_TLS @@ -157,10 +157,10 @@ #define WOLFSSL_SHA384 #endif // -// SHA-512 +// SHA-512 #define MDK_CONF_SHA512 0 #if MDK_CONF_SHA512 == 1 -#define WOLFSSL_SHA512 +#define WOLFSSL_SHA512 #endif // // RIPEMD @@ -188,7 +188,7 @@ #endif // -// AEAD +// AEAD #define MDK_CONF_AEAD 0 #if MDK_CONF_AEAD == 1 #define HAVE_AEAD @@ -215,7 +215,7 @@ #endif // // DSA -#define MDK_CONF_DSA 1 +#define MDK_CONF_DSA 1 #if MDK_CONF_DSA == 0 #define NO_DSA #endif diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-RTX-TCP-FS.h b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-RTX-TCP-FS.h index bd04e62e4..e633fd62e 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-RTX-TCP-FS.h +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config-RTX-TCP-FS.h @@ -1,6 +1,6 @@ /* config-RTX-TCP-FS.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -66,7 +66,7 @@ // Crypt/Cipher Benchmark #define MDK_CONF_CTaoCryptBenchmark 1 #if MDK_CONF_CTaoCryptBenchmark == 0 -#define NO_CRYPT_BENCHMARK +#define NO_CRYPT_BENCHMARK #define BENCH_EMBEDDED #endif // @@ -120,7 +120,7 @@ // SSL (Included by default) // -// TLS +// TLS #define MDK_CONF_TLS 1 #if MDK_CONF_TLS == 0 #define NO_TLS @@ -179,10 +179,10 @@ #define WOLFSSL_SHA384 #endif // -// SHA-512 +// SHA-512 #define MDK_CONF_SHA512 0 #if MDK_CONF_SHA512 == 1 -#define WOLFSSL_SHA512 +#define WOLFSSL_SHA512 #endif // // RIPEMD @@ -210,7 +210,7 @@ #endif // -// AEAD +// AEAD #define MDK_CONF_AEAD 0 #if MDK_CONF_AEAD == 1 #define HAVE_AEAD @@ -237,7 +237,7 @@ #endif // // DSA -#define MDK_CONF_DSA 1 +#define MDK_CONF_DSA 1 #if MDK_CONF_DSA == 0 #define NO_DSA #endif diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config.h b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config.h index 19260198e..7b436bc99 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/config.h +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/config.h @@ -1,6 +1,6 @@ /* config.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/main.c b/IDE/MDK-ARM/MDK-ARM/wolfSSL/main.c index 178ff93cd..cd1b418d2 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/main.c +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/main.c @@ -1,6 +1,6 @@ /* main.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + #ifdef HAVE_CONFIG_H #include #endif @@ -35,7 +35,7 @@ * Initialize a Flash Memory Card *----------------------------------------------------------------------------*/ #if !defined(NO_FILESYSTEM) -static void init_card (void) +static void init_card (void) { U32 retv; @@ -55,14 +55,14 @@ static void init_card (void) * TCP/IP tasks *----------------------------------------------------------------------------*/ #ifdef WOLFSSL_KEIL_TCP_NET -__task void tcp_tick (void) +__task void tcp_tick (void) { - + WOLFSSL_MSG("Time tick started.") ; #if defined (HAVE_KEIL_RTX) os_itv_set (10); #endif - + while (1) { #if defined (HAVE_KEIL_RTX) os_itv_wait (); @@ -99,11 +99,11 @@ extern void benchmark_test(void) ; extern void SER_Init(void) ; /*----------------------------------------------------------------------------- - * mian entry + * mian entry *----------------------------------------------------------------------------*/ /*** This is the parent task entry ***/ -void main_task (void) +void main_task (void) { #ifdef WOLFSSL_KEIL_TCP_NET init_TcpNet (); @@ -111,8 +111,8 @@ void main_task (void) os_tsk_create (tcp_tick, 2); os_tsk_create (tcp_poll, 1); #endif - - #ifdef WOLFSSL_MDK_SHELL + + #ifdef WOLFSSL_MDK_SHELL #ifdef HAVE_KEIL_RTX os_tsk_create_user(shell_main, 1, Shell_stack, SHELL_STACKSIZE) ; #else @@ -124,8 +124,8 @@ void main_task (void) /*** USER APPLICATION HERE ***/ /************************************/ printf("USER LOGIC STARTED\n") ; - - #endif + + #endif #ifdef HAVE_KEIL_RTX WOLFSSL_MSG("Terminating tcp_main\n") ; @@ -148,7 +148,7 @@ extern void SystemInit(void); int main() { - SystemInit(); + SystemInit(); #if !defined(NO_FILESYSTEM) init_card () ; /* initializing SD card */ #endif @@ -157,7 +157,7 @@ int main() { printf("Turning ON Debug message\n") ; wolfSSL_Debugging_ON() ; #endif - + #ifdef HAVE_KEIL_RTX os_sys_init (main_task) ; #else diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c b/IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c index 0b02ab437..3f0283c03 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/shell.c @@ -1,6 +1,6 @@ /*shell.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -19,9 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + /*** tiny Shell for wolfSSL apps ***/ - + #ifdef HAVE_CONFIG_H #include #endif @@ -185,7 +185,7 @@ extern void dh_test(void *arg) ; #ifndef NO_DSA extern void dsa_test(void *arg) ; #endif - + #ifndef NO_PWDBASED extern void pwdbased_test(void *arg) ; #endif @@ -276,8 +276,8 @@ static struct { #ifndef NO_DES3 "des", des_test, "des3", des3_test, -#endif -#ifndef NO_AES +#endif +#ifndef NO_AES "aes", aes_test, #ifdef HAVE_AESGCM "aesgcm", aesgcm_test, @@ -299,10 +299,10 @@ static struct { #endif #ifndef NO_DSA "dsa", dsa_test, -#endif +#endif #ifndef NO_PWDBASED "pwdbased", pwdbased_test, -#endif +#endif #ifdef OPENSSL_EXTRA "openssl", openssl_test, #endif @@ -320,22 +320,22 @@ enum jobtype { FORGROUND, BACKGROUND } ; #define IF_DELIMITER(ch) ((ch) == ' ' || (ch) == '\n') /******* Get Command Line *****************************/ -static int getline(char * line, int sz, func_args *args, int*bf_flg) +static int getline(char * line, int sz, func_args *args, int*bf_flg) { char * ret ; int i ; - + #define MAXARGS 10 #define MAXARGLEN 30 static char *argv[MAXARGS] ; args->argv = argv ; - + putchar('>') ; fflush(stdout) ; ret = fgets(line, sz, stdin) ; #define SHELL_ERROR_FGETS -102 if(ret != line) return(SHELL_ERROR_FGETS) ; - + if(line[strlen(line)-2] == '&') { (*bf_flg) = BACKGROUND ; line[strlen(line)-2] = '\n' ; @@ -363,22 +363,22 @@ static int BackGround = 0 ; /* 1: background job is running */ #define IP_SIZE 16 #ifdef WOLFSSL_KEIL_NET -static void ipaddr_comm(void *args) +static void ipaddr_comm(void *args) { if(((func_args *)args)->argc == 1) { printf("IP addr: %s, port %d\n", wolfSSLIP, wolfSSLPort) ; } else { if(BackGround != 0) { printf("Cannot change IP addr while background server is running\n") ; - } else if(((func_args *)args)->argc == 3 && - ((func_args *)args)->argv[1][0] == '-'&& + } else if(((func_args *)args)->argc == 3 && + ((func_args *)args)->argv[1][0] == '-'&& ((func_args *)args)->argv[1][1] == 'a' ) { /* strcpy(wolfSSLIP, ((func_args *)args)->argv[2]) ; */ - } else if(((func_args *)args)->argc == 3 && - ((func_args *)args)->argv[1][0] == '-' && + } else if(((func_args *)args)->argc == 3 && + ((func_args *)args)->argv[1][0] == '-' && ((func_args *)args)->argv[1][1] == 'p' ) { /* yasslPort = atoi(((func_args *)args)->argv[2]) ; */ - } else printf("Invalid argument\n") ; + } else printf("Invalid argument\n") ; } } @@ -389,7 +389,7 @@ static void ipaddr_comm(void *args) #if defined(HAVE_KEIL_RTX) static int stack_ck = 0 ; -static void stack_comm(void *args) +static void stack_comm(void *args) { if(stack_ck) { printf("Stack Check: Off\n") ; @@ -399,7 +399,7 @@ static void stack_comm(void *args) stack_ck = 1 ; } } - + #define FILL_PATTERN 0xa596695a void stack_fill(char * stack, int size) { @@ -410,13 +410,13 @@ void stack_fill(char * stack, int size) ((int *)stack)[i] = FILL_PATTERN ; } -void stack_check(char * stack, int size) +void stack_check(char * stack, int size) { int i ; - + if(stack_ck == 0)return ; if(stack_ck == 1) { - stack_ck ++ ; return ; + stack_ck ++ ; return ; } for(i=1; iargc == 1) { printf("For %d times\n", for_iteration) ; @@ -446,7 +446,7 @@ static void for_command(void *args) static int wolfsslDebug = 1 ; -static void dbg_comm(void *args) +static void dbg_comm(void *args) { if(wolfsslDebug == 1) { wolfsslDebug = 0 ; @@ -460,9 +460,9 @@ static void dbg_comm(void *args) } #endif -static void help_comm(void *args) +static void help_comm(void *args) { - + } @@ -484,12 +484,12 @@ static wolfSSL_Mutex command_mutex ; #endif /*********** Invoke Forground Command *********************/ -static void command_invoke(void *args) +static void command_invoke(void *args) { void (*func)(void * ) ; int i,iteration ; - func = (void(*)(void *))((func_args *)args)->argv[0] ; + func = (void(*)(void *))((func_args *)args)->argv[0] ; #ifdef HAVE_KEIL_RTX wc_LockMutex((wolfSSL_Mutex *)&command_mutex) ; #endif @@ -499,14 +499,14 @@ static void command_invoke(void *args) #if defined(HAVE_KEIL_RTX) stack_fill(command_stack, COMMAND_STACK_SIZE) ; #endif - + func(args) ; /* invoke command */ - + #if defined(HAVE_KEIL_RTX) stack_check(command_stack, COMMAND_STACK_SIZE) ; #endif } - if(iteration > 1) + if(iteration > 1) for_iteration = 1 ; #ifdef HAVE_KEIL_RTX wc_UnLockMutex((wolfSSL_Mutex *)&command_mutex) ; @@ -517,12 +517,12 @@ static void command_invoke(void *args) #if (!defined(NO_SIMPLE_SERVER) && !defined(NO_ECHOSERVER)) && \ defined(HAVE_KEIL_RTX) /******* Invoke Background Job *******************************/ -static void bg_job_invoke(void *args) +static void bg_job_invoke(void *args) { void (*func)(void * ) ; - BackGround = 1 ; + BackGround = 1 ; stack_fill(bg_job_stack, BG_JOB_STACK_SIZE) ; - func = (void(*)(void *))((func_args *)args)->argv[0] ; + func = (void(*)(void *))((func_args *)args)->argv[0] ; func(args) ; /* invoke command */ stack_check(bg_job_stack, BG_JOB_STACK_SIZE) ; #ifdef WOLFSSL_KEIL_NET @@ -539,14 +539,14 @@ static char line[LINESIZE] ; /********* SHEULL MAIN LOOP ***********************************/ void shell_main(void) { - int i ; + int i ; func_args args ; int bf_flg ; - - i = BackGround ; + + i = BackGround ; /* Dummy for avoiding warning: BackGround is defined but not used. */ - - + + #if defined(HAVE_KEIL_RTX) wc_InitMutex(&command_mutex) ; #endif @@ -574,9 +574,9 @@ void shell_main(void) { if(BackGround != 0) { printf("Multiple background servers not supported.\n") ; } else { - printf("\"%s\" is running with the background mode.\n", + printf("\"%s\" is running with the background mode.\n", commandTable[i].command) ; - os_tsk_create_user_ex( (void(*)(void *))&bg_job_invoke, + os_tsk_create_user_ex( (void(*)(void *))&bg_job_invoke, 6, bg_job_stack, BG_JOB_STACK_SIZE, &args) ; } #else diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/time-CortexM3-4.c b/IDE/MDK-ARM/MDK-ARM/wolfSSL/time-CortexM3-4.c index 2171fa629..115a4f672 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/time-CortexM3-4.c +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/time-CortexM3-4.c @@ -1,6 +1,6 @@ /* time-STM32F2.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -19,14 +19,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + #ifdef HAVE_CONFIG_H #include #endif -#include -#define DWT ((DWT_Type *) (0xE0001000UL) ) +#include +#define DWT ((DWT_Type *) (0xE0001000UL) ) typedef struct { uint32_t CTRL; /*!< Offset: 0x000 (R/W) Control Register */ @@ -35,7 +35,7 @@ typedef struct extern uint32_t SystemCoreClock ; -double current_time(int reset) +double current_time(int reset) { if(reset) DWT->CYCCNT = 0 ; return ((double)DWT->CYCCNT/SystemCoreClock) ; diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/time-dummy.c b/IDE/MDK-ARM/MDK-ARM/wolfSSL/time-dummy.c index 55cd2e0c9..9e9bf4e2e 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/time-dummy.c +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/time-dummy.c @@ -1,6 +1,6 @@ /* time-dummy.c.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -19,16 +19,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + #ifdef HAVE_CONFIG_H #include #endif #include "time.h" -struct tm *wolfssl_MDK_gmtime(const time_t *c) -{ - static struct tm date ; +struct tm *wolfssl_MDK_gmtime(const time_t *c) +{ + static struct tm date ; return(&date) ; } diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/wolfssl_MDK_ARM.c b/IDE/MDK-ARM/MDK-ARM/wolfSSL/wolfssl_MDK_ARM.c index 40984aca2..b90162b38 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/wolfssl_MDK_ARM.c +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/wolfssl_MDK_ARM.c @@ -1,6 +1,6 @@ /* wolfssl_KEIL_RL.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -35,8 +35,8 @@ #if defined(WOLFSSL_MDK5) #include "cmsis_os.h" - #include "rl_fs.h" - #include "rl_net.h" + #include "rl_fs.h" + #include "rl_net.h" #else #include "rtl.h" #endif @@ -58,7 +58,7 @@ /** TCPnet BSD socket does not have following functions. **/ #if defined(WOLFSSL_KEIL_TCP_NET) -char *inet_ntoa(struct in_addr in) +char *inet_ntoa(struct in_addr in) { #define NAMESIZE 16 static char name[NAMESIZE] ; @@ -76,11 +76,11 @@ unsigned long inet_addr(const char *cp) /*** tcp_connect is actually associated with following syassl_tcp_connect. ***/ -int wolfssl_connect(int sd, const struct sockaddr* sa, int sz) +int wolfssl_connect(int sd, const struct sockaddr* sa, int sz) { int ret = 0 ; - #if defined(WOLFSSL_KEIL_TCP_NET) - + #if defined(WOLFSSL_KEIL_TCP_NET) + SOCKADDR_IN addr ; addr = *(SOCKADDR_IN *)sa ; @@ -91,19 +91,19 @@ int wolfssl_connect(int sd, const struct sockaddr* sa, int sz) os_dly_wait(50); } while(ret == SCK_EWOULDBLOCK) ; #ifdef DEBUG_WOLFSSL - { + { char msg[50] ; sprintf(msg, "BSD Connect return code: %d\n", ret) ; WOLFSSL_MSG(msg) ; } #endif - + #endif /* WOLFSSL_KEIL_TCP_NET */ return(ret ) ; } -int wolfssl_accept(int sd, struct sockaddr *addr, int *addrlen) +int wolfssl_accept(int sd, struct sockaddr *addr, int *addrlen) { int ret = 0 ; @@ -113,24 +113,24 @@ int wolfssl_accept(int sd, struct sockaddr *addr, int *addrlen) ret = accept(sd, addr, addrlen) ; if(ret != SCK_EWOULDBLOCK) break ; os_dly_wait(1); - } + } #ifdef DEBUG_WOLFSSL { char msg[50] ; sprintf(msg, "BSD Accept return code: %d\n", ret) ; - WOLFSSL_MSG(msg) ; + WOLFSSL_MSG(msg) ; } #endif - + #endif /* WOLFSSL_KEIL_TCP_NET */ return(ret ) ; } - -int wolfssl_recv(int sd, void *buf, size_t len, int flags) + +int wolfssl_recv(int sd, void *buf, size_t len, int flags) { int ret = 0; - #if defined(WOLFSSL_KEIL_TCP_NET) + #if defined(WOLFSSL_KEIL_TCP_NET) while(1) { #undef recv /* Go to KEIL TCPnet recv */ ret = recv(sd, buf, len, flags) ; @@ -138,10 +138,10 @@ int wolfssl_recv(int sd, void *buf, size_t len, int flags) os_dly_wait(1); } #ifdef DEBUG_WOLFSSL - { + { char msg[50] ; sprintf(msg, "BSD Recv return code: %d\n", ret) ; - WOLFSSL_MSG(msg) ; + WOLFSSL_MSG(msg) ; } #endif @@ -149,22 +149,22 @@ int wolfssl_recv(int sd, void *buf, size_t len, int flags) return(ret ) ; } -int wolfssl_send(int sd, const void *buf, size_t len, int flags) +int wolfssl_send(int sd, const void *buf, size_t len, int flags) { int ret = 0 ; - #if defined(WOLFSSL_KEIL_TCP_NET) + #if defined(WOLFSSL_KEIL_TCP_NET) while(1) { #undef send /* Go to KEIL TCPnet send */ ret = send(sd, buf, len, flags) ; if(ret != SCK_EWOULDBLOCK) break ; os_dly_wait(1); - } + } #ifdef DEBUG_WOLFSSL { char msg[50] ; sprintf(msg, "BSD Send return code: %d\n", ret) ; - WOLFSSL_MSG(msg) ; + WOLFSSL_MSG(msg) ; } #endif @@ -175,49 +175,49 @@ int wolfssl_send(int sd, const void *buf, size_t len, int flags) #endif /* WOLFSSL_KEIL_TCP_NET */ -#if defined(WOLFSSL_KEIL_TCP_NET) -void wolfssl_sleep(int t) +#if defined(WOLFSSL_KEIL_TCP_NET) +void wolfssl_sleep(int t) { #if defined(HAVE_KEIL_RTX) os_dly_wait(t/1000+1) ; #endif } -int wolfssl_tcp_select(int sd, int timeout) +int wolfssl_tcp_select(int sd, int timeout) { - + return 0 ; - + } #endif -FILE * wolfSSL_fopen(const char *name, const char *openmode) +FILE * wolfSSL_fopen(const char *name, const char *openmode) { int i ; FILE * ret ; #define PATHSIZE 100 char path[PATHSIZE] ; char *p ; - + if(strlen(name) > PATHSIZE)return(NULL) ; - + for(i = 0; i<= strlen(name); i++) { if(name[i] == '/')path[i] = '\\' ; else path[i] = name[i] ; - } + } if(path[0] == '.' && path[1] == '\\') p = path + 2 ; else p = path ; ret = fopen (p, openmode) ; - + return(ret) ; } #define getkey getchar #define sendchar putchar -char * wolfssl_fgets ( char * str, int num, FILE * f ) +char * wolfssl_fgets ( char * str, int num, FILE * f ) { int i ; - + for(i = 0 ; i< num ; i++) { while((str[i] = getkey()) == 0) { #if defined (HAVE_KEIL_RTX) && !defined(WOLFSSL_CMSIS_RTOS) @@ -228,15 +228,15 @@ char * wolfssl_fgets ( char * str, int num, FILE * f ) } if(str[i] == '\n' || str[i] == '\012' || str[i] == '\015') { sendchar('\n') ; - str[i++] = '\n' ; - str[i] = '\0' ; + str[i++] = '\n' ; + str[i] = '\0' ; break ; } else if(str[i] == '\010') { /* BS */ if(i) { /* erace one char */ - sendchar('\010') ; sendchar(' ') ; sendchar('\010') ; + sendchar('\010') ; sendchar(' ') ; sendchar('\010') ; i = (i>0 ? (i-2) : -1 ) ; continue ; - } + } } else if(str[i] == '\033' || str[i] == '\004' ) { /* ESC or ^D */ str[i] = '\0' ; return(0) ; diff --git a/IDE/MDK-ARM/MDK-ARM/wolfSSL/wolfssl_MDK_ARM.h b/IDE/MDK-ARM/MDK-ARM/wolfSSL/wolfssl_MDK_ARM.h index 7ad930a24..8b8c4f59e 100644 --- a/IDE/MDK-ARM/MDK-ARM/wolfSSL/wolfssl_MDK_ARM.h +++ b/IDE/MDK-ARM/MDK-ARM/wolfSSL/wolfssl_MDK_ARM.h @@ -1,6 +1,6 @@ /* wolfssl_KEIL_RL.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -31,7 +31,7 @@ #include /* Go to STDIN */ -#define fgets(buff, sz, fd) wolfssl_fgets(buff, sz, fd) +#define fgets(buff, sz, fd) wolfssl_fgets(buff, sz, fd) extern char * wolfssl_fgets ( char * str, int num, FILE * f ) ; #define SOCKET_T int @@ -53,19 +53,19 @@ struct timeval { long tv_usec; /* microseconds */ }; -#if defined(WOLFSSL_KEIL_TCP_NET) +#if defined(WOLFSSL_KEIL_TCP_NET) #if defined(WOLFSSL_MDK5) #define SCK_EWOULDBLOCK BSD_ERROR_WOULDBLOCK #define SCK_ETIMEOUT BSD_ERROR_TIMEOUT -#include "rl_net.h" +#include "rl_net.h" #endif - + typedef int socklen_t ; /* for avoiding conflict with KEIL-TCPnet BSD socket */ /* Bodies are in wolfssl_KEIL_RL.c */ -#define connect(a,b,c) wolfssl_connect(a, (struct sockaddr* )(b), c) +#define connect(a,b,c) wolfssl_connect(a, (struct sockaddr* )(b), c) #define accept wolfssl_accept #define recv wolfssl_recv #define send wolfssl_send @@ -73,7 +73,7 @@ typedef int socklen_t ; /* for avoiding conflicting with KEIL-TCPnet TCP socket */ /* Bodies are in test.h */ -#define tcp_connect wolfssl_tcp_connect +#define tcp_connect wolfssl_tcp_connect #define tcp_socket wolfssl_tcp_soket #define tcp_listen wolfssl_tcp_listen #define tcp_select wolfssl_tcp_select @@ -89,7 +89,7 @@ extern int wolfssl_tcp_select(int sd, int timeout) ; /* TCPnet BSD socket does not have following functions. */ extern char *inet_ntoa(struct in_addr in); extern unsigned long inet_addr(const char *cp); -extern int setsockopt(int sockfd, int level, int optname, +extern int setsockopt(int sockfd, int level, int optname, const void *optval, socklen_t optlen); extern int select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, const struct timeval *timeout); diff --git a/IDE/MDK-ARM/STM32F2xx_StdPeriph_Lib/time-STM32F2xx.c b/IDE/MDK-ARM/STM32F2xx_StdPeriph_Lib/time-STM32F2xx.c index 259228f08..c54d811c9 100644 --- a/IDE/MDK-ARM/STM32F2xx_StdPeriph_Lib/time-STM32F2xx.c +++ b/IDE/MDK-ARM/STM32F2xx_StdPeriph_Lib/time-STM32F2xx.c @@ -1,6 +1,6 @@ /* time-STM32F2xx.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/IDE/MDK5-ARM/Conf/config-Crypt.h b/IDE/MDK5-ARM/Conf/config-Crypt.h index 2022c910f..49d7ef5c0 100644 --- a/IDE/MDK5-ARM/Conf/config-Crypt.h +++ b/IDE/MDK5-ARM/Conf/config-Crypt.h @@ -1,6 +1,6 @@ /* config-Crypt.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -72,10 +72,10 @@ #define WOLFSSL_SHA384 #endif // -// SHA-512 +// SHA-512 #define MDK_CONF_SHA512 1 #if MDK_CONF_SHA512 == 1 -#define WOLFSSL_SHA512 +#define WOLFSSL_SHA512 #endif // // RIPEMD @@ -180,14 +180,14 @@ #endif // // DSA -#define MDK_CONF_DSA 1 +#define MDK_CONF_DSA 1 #if MDK_CONF_DSA == 0 #define NO_DSA #endif // // SRP -#define MDK_CONF_SRP 1 +#define MDK_CONF_SRP 1 #if MDK_CONF_SRP == 1 #define HAVE_SRP #endif diff --git a/IDE/MDK5-ARM/Inc/config.h b/IDE/MDK5-ARM/Inc/config.h index 9010d13be..5603410fe 100644 --- a/IDE/MDK5-ARM/Inc/config.h +++ b/IDE/MDK5-ARM/Inc/config.h @@ -1,6 +1,6 @@ /* config.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/IDE/MDK5-ARM/Inc/wolfssl_MDK_ARM.h b/IDE/MDK5-ARM/Inc/wolfssl_MDK_ARM.h index b7261dae7..a0fcab9c4 100644 --- a/IDE/MDK5-ARM/Inc/wolfssl_MDK_ARM.h +++ b/IDE/MDK5-ARM/Inc/wolfssl_MDK_ARM.h @@ -1,6 +1,6 @@ /* wolfssl_KEIL_ARM.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -28,7 +28,7 @@ #include /* Go to STDIN */ -#define fgets(buff, sz, fd) wolfssl_fgets(buff, sz, fd) +#define fgets(buff, sz, fd) wolfssl_fgets(buff, sz, fd) extern char * wolfssl_fgets ( char * str, int num, FILE * f ) ; #define SOCKET_T int @@ -51,12 +51,12 @@ struct timeval { }; -#if defined(WOLFSSL_KEIL_TCP_NET) +#if defined(WOLFSSL_KEIL_TCP_NET) #define SCK_EWOULDBLOCK BSD_ERROR_WOULDBLOCK #define SCK_ETIMEOUT BSD_ERROR_TIMEOUT -#include "rl_net.h" - +#include "rl_net.h" + typedef int socklen_t ; /* for avoiding conflict with KEIL-TCPnet BSD socket */ @@ -69,7 +69,7 @@ typedef int socklen_t ; /* for avoiding conflicting with KEIL-TCPnet TCP socket */ /* Bodies are in test.h */ -#define tcp_connect wolfssl_tcp_connect +#define tcp_connect wolfssl_tcp_connect #define tcp_socket wolfssl_tcp_soket #define tcp_listen wolfssl_tcp_listen #define tcp_select(a,b) (0) diff --git a/IDE/MDK5-ARM/Projects/CryptBenchmark/main.c b/IDE/MDK5-ARM/Projects/CryptBenchmark/main.c index 270c04755..0ce49c0b6 100644 --- a/IDE/MDK5-ARM/Projects/CryptBenchmark/main.c +++ b/IDE/MDK5-ARM/Projects/CryptBenchmark/main.c @@ -1,6 +1,6 @@ /* main.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + #ifdef HAVE_CONFIG_H #include #endif @@ -64,10 +64,10 @@ static void init_filesystem (void) { #endif /*----------------------------------------------------------------------------- - * mian entry + * mian entry *----------------------------------------------------------------------------*/ void benchmark_test(void *arg) ; -int main() +int main() { void * arg = NULL ; @@ -77,11 +77,11 @@ int main() #if !defined(NO_FILESYSTEM) init_filesystem (); #endif - osDelay(300) ; + osDelay(300) ; printf("=== Start: Crypt Benchmark ===\n") ; benchmark_test(arg) ; - printf("=== End: Crypt Benchmark ===\n") ; + printf("=== End: Crypt Benchmark ===\n") ; + - } diff --git a/IDE/MDK5-ARM/Projects/CryptBenchmark/time-CortexM3-4.c b/IDE/MDK5-ARM/Projects/CryptBenchmark/time-CortexM3-4.c index 2171fa629..115a4f672 100644 --- a/IDE/MDK5-ARM/Projects/CryptBenchmark/time-CortexM3-4.c +++ b/IDE/MDK5-ARM/Projects/CryptBenchmark/time-CortexM3-4.c @@ -1,6 +1,6 @@ /* time-STM32F2.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -19,14 +19,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + #ifdef HAVE_CONFIG_H #include #endif -#include -#define DWT ((DWT_Type *) (0xE0001000UL) ) +#include +#define DWT ((DWT_Type *) (0xE0001000UL) ) typedef struct { uint32_t CTRL; /*!< Offset: 0x000 (R/W) Control Register */ @@ -35,7 +35,7 @@ typedef struct extern uint32_t SystemCoreClock ; -double current_time(int reset) +double current_time(int reset) { if(reset) DWT->CYCCNT = 0 ; return ((double)DWT->CYCCNT/SystemCoreClock) ; diff --git a/IDE/MDK5-ARM/Projects/CryptTest/main.c b/IDE/MDK5-ARM/Projects/CryptTest/main.c index cd0f42ae1..814051c8a 100644 --- a/IDE/MDK5-ARM/Projects/CryptTest/main.c +++ b/IDE/MDK5-ARM/Projects/CryptTest/main.c @@ -1,6 +1,6 @@ /* main.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + #ifdef HAVE_CONFIG_H #include #endif @@ -63,10 +63,10 @@ static void init_filesystem (void) { #endif /*----------------------------------------------------------------------------- - * mian entry + * mian entry *----------------------------------------------------------------------------*/ -int main() +int main() { void * arg = NULL ; @@ -76,10 +76,10 @@ int main() #if !defined(NO_FILESYSTEM) init_filesystem (); #endif - osDelay(1000) ; + osDelay(1000) ; printf("=== Start: Crypt test ===\n") ; wolfcrypt_test(arg) ; - printf("=== End: Crypt test ===\n") ; - + printf("=== End: Crypt test ===\n") ; + } diff --git a/IDE/MDK5-ARM/Projects/EchoClient/config-EchoClient.h b/IDE/MDK5-ARM/Projects/EchoClient/config-EchoClient.h index 01bdb25e2..e9d2bbd61 100644 --- a/IDE/MDK5-ARM/Projects/EchoClient/config-EchoClient.h +++ b/IDE/MDK5-ARM/Projects/EchoClient/config-EchoClient.h @@ -1,6 +1,6 @@ /* config-RTX-TCP-FS.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/IDE/MDK5-ARM/Projects/EchoClient/main.c b/IDE/MDK5-ARM/Projects/EchoClient/main.c index 5583bcb85..37aab6c0e 100644 --- a/IDE/MDK5-ARM/Projects/EchoClient/main.c +++ b/IDE/MDK5-ARM/Projects/EchoClient/main.c @@ -1,6 +1,6 @@ /* main.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + #ifdef HAVE_CONFIG_H #include #endif @@ -28,7 +28,7 @@ #include "stm32f2xx_hal.h" #include "cmsis_os.h" -#include "rl_net.h" +#include "rl_net.h" #include #include @@ -72,13 +72,13 @@ typedef struct func_args { extern void echoclient_test(func_args * args) ; /*----------------------------------------------------------------------------- - * mian entry + * mian entry *----------------------------------------------------------------------------*/ int myoptind = 0; char* myoptarg = NULL; -int main() -{ +int main() +{ func_args args ; args.argc = 1 ; @@ -87,7 +87,7 @@ int main() init_filesystem (); #endif netInitialize() ; - osDelay(300) ; + osDelay(300) ; #if defined(DEBUG_WOLFSSL) printf("Turning ON Debug message\n") ; wolfSSL_Debugging_ON() ; diff --git a/IDE/MDK5-ARM/Projects/EchoServer/main.c b/IDE/MDK5-ARM/Projects/EchoServer/main.c index 058a72346..b039c15d4 100644 --- a/IDE/MDK5-ARM/Projects/EchoServer/main.c +++ b/IDE/MDK5-ARM/Projects/EchoServer/main.c @@ -1,6 +1,6 @@ /* main.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + #ifdef HAVE_CONFIG_H #include #endif @@ -28,7 +28,7 @@ #include "stm32f2xx_hal.h" #include "cmsis_os.h" -#include "rl_net.h" +#include "rl_net.h" #include #include @@ -66,7 +66,7 @@ static void init_filesystem (void) { /*----------------------------------------------------------------------------- - * mian entry + * mian entry *----------------------------------------------------------------------------*/ typedef struct func_args { @@ -76,7 +76,7 @@ typedef struct func_args { extern void echoserver_test(func_args * args) ; -int main() +int main() { func_args args ; args.argc = 1 ; @@ -86,7 +86,7 @@ int main() init_filesystem (); #endif netInitialize() ; - osDelay(300) ; + osDelay(300) ; #if defined(DEBUG_WOLFSSL) printf("Turning ON Debug message\n") ; wolfSSL_Debugging_ON() ; diff --git a/IDE/MDK5-ARM/Projects/SimpleClient/config-SimpleClient.h b/IDE/MDK5-ARM/Projects/SimpleClient/config-SimpleClient.h index 10dc1dadb..c16dd0b42 100644 --- a/IDE/MDK5-ARM/Projects/SimpleClient/config-SimpleClient.h +++ b/IDE/MDK5-ARM/Projects/SimpleClient/config-SimpleClient.h @@ -1,6 +1,6 @@ /* config-RTX-TCP-FS.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/IDE/MDK5-ARM/Projects/SimpleClient/main.c b/IDE/MDK5-ARM/Projects/SimpleClient/main.c index a1e1e91e8..4374cbf30 100644 --- a/IDE/MDK5-ARM/Projects/SimpleClient/main.c +++ b/IDE/MDK5-ARM/Projects/SimpleClient/main.c @@ -1,6 +1,6 @@ /* main.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + #ifdef HAVE_CONFIG_H #include #endif @@ -28,7 +28,7 @@ #include "stm32f2xx_hal.h" #include "cmsis_os.h" -#include "rl_net.h" +#include "rl_net.h" #include #include @@ -75,31 +75,31 @@ extern void client_test(func_args * args) ; int myoptind = 0; char* myoptarg = NULL; -int main() +int main() { - static char *argv[] = - { "client", "-h", WOLFSSL_CALLEE_IP, "-p", WOLFSSL_CALLEE_PORT, + static char *argv[] = + { "client", "-h", WOLFSSL_CALLEE_IP, "-p", WOLFSSL_CALLEE_PORT, "-v", WOLFSSL_SSL_VER, WOLFSSL_HTTP_GET } ; - static func_args args = - { 7 + WOLFSSL_HTTP_GET_COUNT, argv } ; - + static func_args args = + { 7 + WOLFSSL_HTTP_GET_COUNT, argv } ; + SystemClock_Config (); #if !defined(NO_FILESYSTEM) init_filesystem (); #endif netInitialize() ; - osDelay(300) ; + osDelay(300) ; #if defined(DEBUG_WOLFSSL) printf("Turning ON Debug message\n") ; wolfSSL_Debugging_ON() ; #endif - + if(args.argc == 7) printf("Simple SSL/TLS, ") ; else printf("HTTP GET, ") ; - printf("Callee IP: %s, Port: %s, Version:%s\n", argv[2], argv[4], argv[6]) ; + printf("Callee IP: %s, Port: %s, Version:%s\n", argv[2], argv[4], argv[6]) ; while(1) { client_test(&args) ; diff --git a/IDE/MDK5-ARM/Projects/SimpleClient/time-CortexM3-4.c b/IDE/MDK5-ARM/Projects/SimpleClient/time-CortexM3-4.c index 2171fa629..115a4f672 100644 --- a/IDE/MDK5-ARM/Projects/SimpleClient/time-CortexM3-4.c +++ b/IDE/MDK5-ARM/Projects/SimpleClient/time-CortexM3-4.c @@ -1,6 +1,6 @@ /* time-STM32F2.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -19,14 +19,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + #ifdef HAVE_CONFIG_H #include #endif -#include -#define DWT ((DWT_Type *) (0xE0001000UL) ) +#include +#define DWT ((DWT_Type *) (0xE0001000UL) ) typedef struct { uint32_t CTRL; /*!< Offset: 0x000 (R/W) Control Register */ @@ -35,7 +35,7 @@ typedef struct extern uint32_t SystemCoreClock ; -double current_time(int reset) +double current_time(int reset) { if(reset) DWT->CYCCNT = 0 ; return ((double)DWT->CYCCNT/SystemCoreClock) ; diff --git a/IDE/MDK5-ARM/Projects/SimpleServer/config-SimpleServer.h b/IDE/MDK5-ARM/Projects/SimpleServer/config-SimpleServer.h index 1b9fccb86..f8486fa6f 100644 --- a/IDE/MDK5-ARM/Projects/SimpleServer/config-SimpleServer.h +++ b/IDE/MDK5-ARM/Projects/SimpleServer/config-SimpleServer.h @@ -1,6 +1,6 @@ /* SimpleServer.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/IDE/MDK5-ARM/Projects/SimpleServer/main.c b/IDE/MDK5-ARM/Projects/SimpleServer/main.c index b8f0fad46..772d844aa 100644 --- a/IDE/MDK5-ARM/Projects/SimpleServer/main.c +++ b/IDE/MDK5-ARM/Projects/SimpleServer/main.c @@ -1,6 +1,6 @@ /* main.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + #ifdef HAVE_CONFIG_H #include #endif @@ -28,7 +28,7 @@ #include "stm32f2xx_hal.h" #include "cmsis_os.h" -#include "rl_net.h" +#include "rl_net.h" #include #include @@ -74,31 +74,31 @@ extern void server_test(func_args * args) ; #include "config-SimpleServer.h" /*----------------------------------------------------------------------------- - * mian entry + * mian entry *----------------------------------------------------------------------------*/ int myoptind = 0; char* myoptarg = NULL; -int main() +int main() { static char *argv[] = { "server", "-p", WOLFSSL_LISTEN_PORT, "-d"} ; - static func_args args = { 4, argv } ; - + static func_args args = { 4, argv } ; + SystemClock_Config (); #if !defined(NO_FILESYSTEM) init_filesystem (); #endif netInitialize() ; - osDelay(300) ; + osDelay(300) ; #if defined(DEBUG_WOLFSSL) printf("Turning ON Debug message\n") ; wolfSSL_Debugging_ON() ; #endif - + printf("Simple Server: Started\n") ; while(1) { server_test(&args) ; printf("Enter any key to iterate.\n") ; getchar() ; - } + } } diff --git a/IDE/MDK5-ARM/Projects/wolfSSL-Full/main.c b/IDE/MDK5-ARM/Projects/wolfSSL-Full/main.c index ea9726003..d2fbc8fc3 100644 --- a/IDE/MDK5-ARM/Projects/wolfSSL-Full/main.c +++ b/IDE/MDK5-ARM/Projects/wolfSSL-Full/main.c @@ -1,6 +1,6 @@ /* main.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + #ifdef HAVE_CONFIG_H #include #endif @@ -33,7 +33,7 @@ #include "wolfcrypt/src/misc.c" #include "stm32f2xx_hal.h" #include "cmsis_os.h" -#include "rl_net.h" +#include "rl_net.h" #include #include @@ -79,12 +79,12 @@ typedef struct func_args { extern void shell_main(func_args * args) ; /*----------------------------------------------------------------------------- - * mian entry + * mian entry *----------------------------------------------------------------------------*/ int myoptind = 0; char* myoptarg = NULL; -int main() +int main() { void *arg = NULL ; @@ -92,15 +92,15 @@ int main() #if !defined(NO_FILESYSTEM) init_filesystem (); #endif - + netInitialize() ; osDelay(300) ; - + #if defined(DEBUG_WOLFSSL) printf("Turning ON Debug message\n") ; wolfSSL_Debugging_ON() ; #endif - shell_main(arg) ; + shell_main(arg) ; } diff --git a/IDE/MDK5-ARM/Projects/wolfSSL-Full/shell.c b/IDE/MDK5-ARM/Projects/wolfSSL-Full/shell.c index ee00e4dc6..c25799f07 100644 --- a/IDE/MDK5-ARM/Projects/wolfSSL-Full/shell.c +++ b/IDE/MDK5-ARM/Projects/wolfSSL-Full/shell.c @@ -1,6 +1,6 @@ /*shell.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -19,9 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + /*** tiny Shell for wolfSSL apps ***/ - + #ifdef HAVE_CONFIG_H #include #endif @@ -36,7 +36,7 @@ #include #if defined(WOLFSSL_MDK5) || defined(WOLFSSL_KEIL_TCP_NET) #include "cmsis_os.h" - #include "rl_fs.h" + #include "rl_fs.h" #else #include #endif @@ -192,7 +192,7 @@ extern void dh_test(void *arg) ; #ifndef NO_DSA extern void dsa_test(void *arg) ; #endif - + #ifndef NO_PWDBASED extern void pwdbased_test(void *arg) ; #endif @@ -283,8 +283,8 @@ static struct { #ifndef NO_DES3 "des", des_test, "des3", des3_test, -#endif -#ifndef NO_AES +#endif +#ifndef NO_AES "aes", aes_test, #ifdef HAVE_AESGCM "aesgcm", aesgcm_test, @@ -306,10 +306,10 @@ static struct { #endif #ifndef NO_DSA "dsa", dsa_test, -#endif +#endif #ifndef NO_PWDBASED "pwdbased", pwdbased_test, -#endif +#endif #ifdef OPENSSL_EXTRA "openssl", openssl_test, #endif @@ -328,29 +328,29 @@ enum jobtype { FORGROUND, BACKGROUND } ; static int BackGround = 0 ; /* 1: background job is running */ -char * wolfssl_fgets ( char * str, int num, FILE * f ) +char * wolfssl_fgets ( char * str, int num, FILE * f ) { int i ; - + for(i = 0 ; i< num ; i++) { while((str[i] = getchar()) == 0) { #if defined (HAVE_KEIL_RTX) && !defined(WOLFSSL_CMSIS_RTOS) os_tsk_pass (); - #else + #else osThreadYield (); #endif } if(str[i] == '\n' || str[i] == '\012' || str[i] == '\015') { putchar('\n') ; - str[i++] = '\n' ; - str[i] = '\0' ; + str[i++] = '\n' ; + str[i] = '\0' ; break ; } else if(str[i] == '\010') { /* BS */ if(i) { /* erace one char */ - putchar('\010') ; putchar(' ') ; putchar('\010') ; + putchar('\010') ; putchar(' ') ; putchar('\010') ; i = (i>0 ? (i-2) : -1 ) ; continue ; - } + } } else if(str[i] == '\033' || str[i] == '\004' ) { /* ESC or ^D */ str[i] = '\0' ; return(0) ; @@ -361,23 +361,23 @@ char * wolfssl_fgets ( char * str, int num, FILE * f ) } /******* Get Command Line *****************************/ -static int getline(char * line, int sz, func_args *args, int*bf_flg) +static int getline(char * line, int sz, func_args *args, int*bf_flg) { char * ret ; int i ; - + #define MAXARGS 10 #define MAXARGLEN 30 static char *argv[MAXARGS] ; args->argv = argv ; - + putchar('>') ; fflush(stdout) ; ret = wolfssl_fgets(line, sz, stdin) ; - + #define SHELL_ERROR_FGETS -102 if(ret != line) return(SHELL_ERROR_FGETS) ; - + if(line[strlen(line)-2] == '&') { (*bf_flg) = BACKGROUND ; line[strlen(line)-2] = '\n' ; @@ -404,22 +404,22 @@ static int getline(char * line, int sz, func_args *args, int*bf_flg) #define IP_SIZE 16 #ifdef WOLFSSL_KEIL_TCP_NET -static void ipaddr_comm(void *args) +static void ipaddr_comm(void *args) { if(((func_args *)args)->argc == 1) { printf("IP addr: %s, port %d\n", wolfSSLIP, wolfSSLPort) ; } else { if(BackGround != 0) { printf("Cannot change IP addr while background server is running\n") ; - } else if(((func_args *)args)->argc == 3 && - ((func_args *)args)->argv[1][0] == '-'&& + } else if(((func_args *)args)->argc == 3 && + ((func_args *)args)->argv[1][0] == '-'&& ((func_args *)args)->argv[1][1] == 'a' ) { /* strcpy(yasslIP, ((func_args *)args)->argv[2]) ; */ - } else if(((func_args *)args)->argc == 3 && - ((func_args *)args)->argv[1][0] == '-' && + } else if(((func_args *)args)->argc == 3 && + ((func_args *)args)->argv[1][0] == '-' && ((func_args *)args)->argv[1][1] == 'p' ) { /* yasslPort = atoi(((func_args *)args)->argv[2]) ; */ - } else printf("Invalid argument\n") ; + } else printf("Invalid argument\n") ; } } @@ -430,7 +430,7 @@ static void ipaddr_comm(void *args) #if defined(HAVE_KEIL_RTX) static int stack_ck = 0 ; -void stack_comm(void *args) +void stack_comm(void *args) { if(stack_ck) { printf("Stack Check: Off\n") ; @@ -440,7 +440,7 @@ void stack_comm(void *args) stack_ck = 1 ; } } - + #define FILL_PATTERN 0xa596695a void stack_fill(char * stack, int size) { @@ -451,13 +451,13 @@ void stack_fill(char * stack, int size) ((int *)stack)[i] = FILL_PATTERN ; } -void stack_check(char * stack, int size) +void stack_check(char * stack, int size) { int i ; - + if(stack_ck == 0)return ; if(stack_ck == 1) { - stack_ck ++ ; return ; + stack_ck ++ ; return ; } for(i=1; iargc == 1) { printf("For %d times\n", for_iteration) ; @@ -487,7 +487,7 @@ static void for_command(void *args) static int wolfsslDebug = 1 ; -static void dbg_comm(void *args) +static void dbg_comm(void *args) { if(wolfsslDebug == 1) { wolfsslDebug = 0 ; @@ -501,10 +501,10 @@ static void dbg_comm(void *args) } #endif -static void help_comm(void *args) +static void help_comm(void *args) { static char *commands[] = { - "test", + "test", "benchmark", "echoserver& : simple echo server in background mode", "echoclient : simple echo client followed by any input string, or \"quit\", \"break\"", @@ -513,7 +513,7 @@ static void help_comm(void *args) "client -g -v [0123] -h xxx.xxx.xxx.xxx -p 443 : usage example", "server/client -h : help for server/client command", "help", - "" + "" } ; int i ; @@ -555,12 +555,12 @@ void exit_command(void) { /*********** Invoke Forground Command *********************/ -static void command_invoke(void const *args) +static void command_invoke(void const *args) { void (*func)(void const * ) ; int i,iteration ; - - func = (void(*)(void const *))((func_args *)args)->argv[0] ; + + func = (void(*)(void const *))((func_args *)args)->argv[0] ; #if defined(HAVE_KEIL_RTX) wc_LockMutex((wolfSSL_Mutex *)&command_mutex) ; #endif @@ -570,15 +570,15 @@ static void command_invoke(void const *args) #if defined(HAVE_KEIL_RTX) && !defined(WOLFSSL_CMSIS_RTOS) stack_fill(command_stack, COMMAND_STACK_SIZE) ; #endif - + func(args) ; /* invoke command */ - + #if defined(HAVE_KEIL_RTX)&& !defined(WOLFSSL_CMSIS_RTOS) stack_check(command_stack, COMMAND_STACK_SIZE) ; #endif } - if(iteration > 1) + if(iteration > 1) for_iteration = 1 ; osDelay(20000) ; #ifdef HAVE_KEIL_RTX @@ -593,26 +593,26 @@ static void command_invoke(void const *args) #if defined(HAVE_KEIL_RTX) || defined(WOLFSSL_CMSIS_RTOS) /******* Invoke Background Job *******************************/ -static void bg_job_invoke(void const *args) +static void bg_job_invoke(void const *args) { void (*func)(void const * ) ; - BackGround = 1 ; + BackGround = 1 ; #if defined(HAVE_KEIL_RTX)&& !defined(WOLFSSL_CMSIS_RTOS) stack_fill(bg_job_stack, BG_JOB_STACK_SIZE) ; #endif - func = (void(*)(void const *))((func_args *)args)->argv[0] ; + func = (void(*)(void const *))((func_args *)args)->argv[0] ; func(args) ; /* invoke command */ #if defined(HAVE_KEIL_RTX) && !defined(WOLFSSL_CMSIS_RTOS) stack_check(bg_job_stack, BG_JOB_STACK_SIZE) ; #endif - + osDelay(20000) ; BackGround = 0 ; #ifdef WOLFSSL_CMSIS_RTOS osThreadTerminate(osThreadGetId()) ; - #else + #else os_tsk_delete_self() ; ; #endif } @@ -627,18 +627,18 @@ static char line[LINESIZE] ; #endif /********* SHEULL MAIN LOOP ***********************************/ void shell_main(void *arg) { - int i ; + int i ; func_args args ; int bf_flg ; osThreadId cmd ; - i = BackGround ; + i = BackGround ; /* Dummy for avoiding warning: BackGround is defined but not used. */ - - #if defined(HAVE_KEIL_RTX) + + #if defined(HAVE_KEIL_RTX) wc_InitMutex(&command_mutex) ; #endif help_comm(NULL) ; - + printf("Starting Shell\n") ; while(1) { if(getline(line, LINESIZE, &args, &bf_flg) > 0) { @@ -654,7 +654,7 @@ void shell_main(void *arg) { #else #if defined(WOLFSSL_CMSIS_RTOS) wc_UnLockMutex((wolfSSL_Mutex *)&command_mutex) ; - cmd = osThreadCreate (osThread (command_invoke) , &args); + cmd = osThreadCreate (osThread (command_invoke) , &args); if(cmd == NULL) { printf("Cannon create command thread\n") ; } @@ -673,13 +673,13 @@ void shell_main(void *arg) { if(BackGround != 0) { printf("Multiple background servers not supported.\n") ; } else { - printf("\"%s\" is running with the background mode.\n", + printf("\"%s\" is running with the background mode.\n", commandTable[i].command) ; #if defined(HAVE_KEIL_RTX) && !defined(WOLFSSL_CMSIS_RTOS) - os_tsk_create_user_ex( (void(*)(void *))&bg_job_invoke, + os_tsk_create_user_ex( (void(*)(void *))&bg_job_invoke, 6, bg_job_stack, BG_JOB_STACK_SIZE, &args) ; #else - osThreadCreate (osThread (bg_job_invoke), &args); + osThreadCreate (osThread (bg_job_invoke), &args); osDelay (500) ; #endif } diff --git a/IDE/MDK5-ARM/Projects/wolfSSL-Full/time-CortexM3-4.c b/IDE/MDK5-ARM/Projects/wolfSSL-Full/time-CortexM3-4.c index 0f6b02bbe..ac4442d00 100644 --- a/IDE/MDK5-ARM/Projects/wolfSSL-Full/time-CortexM3-4.c +++ b/IDE/MDK5-ARM/Projects/wolfSSL-Full/time-CortexM3-4.c @@ -1,6 +1,6 @@ /* time-STM32F2.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -19,15 +19,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + #ifdef HAVE_CONFIG_H #include #endif #include -#include -#define DWT ((DWT_Type *) (0xE0001000UL) ) +#include +#define DWT ((DWT_Type *) (0xE0001000UL) ) typedef struct { uint32_t CTRL; /*!< Offset: 0x000 (R/W) Control Register */ @@ -36,7 +36,7 @@ typedef struct extern uint32_t SystemCoreClock ; -double current_time(int reset) +double current_time(int reset) { if(reset) DWT->CYCCNT = 0 ; return ((double)DWT->CYCCNT/SystemCoreClock) ; diff --git a/IDE/MDK5-ARM/Src/ssl-dummy.c b/IDE/MDK5-ARM/Src/ssl-dummy.c index 8b5cba869..b62ac347a 100644 --- a/IDE/MDK5-ARM/Src/ssl-dummy.c +++ b/IDE/MDK5-ARM/Src/ssl-dummy.c @@ -1,6 +1,6 @@ /* ssl-dummy.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -27,8 +27,8 @@ #include #include -Signer* GetCA(void* vp, byte* hash) -{ +Signer* GetCA(void* vp, byte* hash) +{ return NULL ; } @@ -47,7 +47,7 @@ Signer* GetCAByName(void* vp, byte* hash) return NULL ; } -int CyaSSL_PemCertToDer(const char* fileName, unsigned char* derBuf, int derSz) +int CyaSSL_PemCertToDer(const char* fileName, unsigned char* derBuf, int derSz) { return NULL ; } diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/arm_startup.c b/IDE/ROWLEY-CROSSWORKS-ARM/arm_startup.c index 28cdce3ea..0faae8ecd 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/arm_startup.c +++ b/IDE/ROWLEY-CROSSWORKS-ARM/arm_startup.c @@ -1,6 +1,6 @@ /* arm_startup.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -65,7 +65,7 @@ void reset_handler(void) memcpy32(__data_load_start__, __data_start__, __data_end__); meminit32(__bss_start__, __bss_end__); memcpy32(__fast_load_start__, __fast_start__, __fast_end__); - + // Init heap __heap_start__[0] = 0; __heap_start__[1] = ((uint32_t)__heap_end__ - (uint32_t)__heap_start__); @@ -120,8 +120,8 @@ void HardFault_HandlerC( uint32_t *hardfault_args ) // Configurable Fault Status Register // Consists of MMSR, BFSR and UFSR - _CFSR = (*((volatile uint32_t *)(0xE000ED28))); - + _CFSR = (*((volatile uint32_t *)(0xE000ED28))); + // Hard Fault Status Register _HFSR = (*((volatile uint32_t *)(0xE000ED2C))); @@ -158,7 +158,7 @@ void HardFault_HandlerC( uint32_t *hardfault_args ) __asm("BKPT #0\n"); } -__attribute__( ( naked ) ) +__attribute__( ( naked ) ) void HardFault_Handler(void) { __asm volatile diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c b/IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c index efc82f685..de78caeaa 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c +++ b/IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c @@ -1,6 +1,6 @@ /* benchmark_main.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -38,7 +38,7 @@ static func_args args = { 0 } ; extern double current_time(int reset); -void main(void) +void main(void) { int test_num = 0; @@ -47,12 +47,12 @@ void main(void) printf("\nBenchmark Test %d:\n", test_num); benchmark_test(&args); printf("Benchmark Test %d: Return code %d\n", test_num, args.return_code); - + test_num++; } while(args.return_code == 0); } -/* +/* SAMPLE OUTPUT: Freescale K64 running at 96MHz with no MMCAU: Benchmark Test 0: AES 25 kB took 0.073 seconds, 0.334 MB/s diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/kinetis_hw.c b/IDE/ROWLEY-CROSSWORKS-ARM/kinetis_hw.c index 35b62fd41..b37396d9e 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/kinetis_hw.c +++ b/IDE/ROWLEY-CROSSWORKS-ARM/kinetis_hw.c @@ -1,6 +1,6 @@ /* kinetis_hw.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -100,9 +100,9 @@ static void hw_mcg_init(void) BOARD_BootClockHSRUN(); #else /* Adjust clock dividers (core/system=div/1, bus=div/2, flex bus=div/2, flash=div/4) */ - SIM->CLKDIV1 = SIM_CLKDIV1_OUTDIV1(SYS_CLK_DIV-1) | SIM_CLKDIV1_OUTDIV2(BUS_CLK_DIV-1) | + SIM->CLKDIV1 = SIM_CLKDIV1_OUTDIV1(SYS_CLK_DIV-1) | SIM_CLKDIV1_OUTDIV2(BUS_CLK_DIV-1) | SIM_CLKDIV1_OUTDIV3(BUS_CLK_DIV-1) | SIM_CLKDIV1_OUTDIV4(FLASH_CLK_DIV-1); - + /* Configure FEI internal clock speed */ MCG->C4 = (SYS_CLK_DMX | SYS_CLK_DRS); while((MCG->C4 & (MCG_C4_DRST_DRS_MASK | MCG_C4_DMX32_MASK)) != (SYS_CLK_DMX | SYS_CLK_DRS)); @@ -146,7 +146,7 @@ static void hw_uart_init(void) /* Enable UART core clock */ /* Note: Remember to update me if UART_PORT changes */ SIM->SCGC1 |= SIM_SCGC1_UART4_MASK; - + /* Configure UART TX pin */ UART_TX_PORT->PCR[UART_TX_PIN] = PORT_PCR_MUX(UART_TX_MUX); @@ -155,17 +155,17 @@ static void hw_uart_init(void) /* Configure the UART for 8-bit mode, no parity */ UART_PORT->C1 = 0; - + /* Calculate baud settings */ sbr = (uint16_t)((BUS_CLK_KHZ * 1000)/(UART_BAUD * 16)); temp = UART_PORT->BDH & ~(UART_BDH_SBR(0x1F)); UART_PORT->BDH = temp | UART_BDH_SBR(((sbr & 0x1F00) >> 8)); UART_PORT->BDL = (uint8_t)(sbr & UART_BDL_SBR_MASK); - + /* Determine if a fractional divider is needed to get closer to the baud rate */ brfa = (((BUS_CLK_KHZ * 32000)/(UART_BAUD * 16)) - (sbr * 32)); temp = UART_PORT->C4 & ~(UART_C4_BRFA(0x1F)); - UART_PORT->C4 = temp | UART_C4_BRFA(brfa); + UART_PORT->C4 = temp | UART_C4_BRFA(brfa); /* Enable receiver and transmitter */ UART_PORT->C2 |= (UART_C2_TE_MASK | UART_C2_RE_MASK); @@ -314,7 +314,7 @@ const struct flash_conf flash_conf __attribute__ ((section (".flashconf"),used)) { .backdoor_key = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, .fprot = { 0xFF, 0xFF, 0xFF, 0xFF }, - .fsec = NV_FSEC_SEC(FSEC_UNSECURE) | NV_FSEC_FSLACC(FSEC_FSLACC_GRANTED) | + .fsec = NV_FSEC_SEC(FSEC_UNSECURE) | NV_FSEC_FSLACC(FSEC_FSLACC_GRANTED) | NV_FSEC_MEEN(FSEC_MASS_ERASE_ENABLE) | NV_FSEC_KEYEN(FSEC_KEY_DISABLED), .fopt = 0xFF, .feprot = 0xFF, diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/retarget.c b/IDE/ROWLEY-CROSSWORKS-ARM/retarget.c index a2a61a4f4..b0af7a07d 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/retarget.c +++ b/IDE/ROWLEY-CROSSWORKS-ARM/retarget.c @@ -1,6 +1,6 @@ /* retarget.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/test_main.c b/IDE/ROWLEY-CROSSWORKS-ARM/test_main.c index af58769ed..133c18d72 100644 --- a/IDE/ROWLEY-CROSSWORKS-ARM/test_main.c +++ b/IDE/ROWLEY-CROSSWORKS-ARM/test_main.c @@ -1,6 +1,6 @@ /* test_main.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -38,7 +38,7 @@ typedef struct func_args { static func_args args = { 0 } ; -void main(void) +void main(void) { int test_num = 0; @@ -47,13 +47,13 @@ void main(void) printf("\nCrypt Test %d:\n", test_num); wolfcrypt_test(&args); printf("Crypt Test %d: Return code %d\n", test_num, args.return_code); - + test_num++; } while(args.return_code == 0); } -/* SAMPLE OUTPUT: +/* SAMPLE OUTPUT: Crypt Test 0: SHA test passed! SHA-256 test passed! diff --git a/README b/README index 08e2b2d52..00fda2fa8 100644 --- a/README +++ b/README @@ -34,6 +34,59 @@ before calling wolfSSL_new(); Though it's not recommended. *** end Notes *** + +********* wolfSSL (Formerly CyaSSL) Release 3.12.2 (10/20/2017) + +Release 3.12.2 of wolfSSL has bug fixes and new features including: + +This release includes many performance improvements with Intel ASM (AVX/AVX2) and AES-NI. New single precision math option to speedup RSA, DH and ECC. Embedded hardware support has been expanded for STM32, PIC32MZ and ATECC508A. AES now supports XTS mode for disk encryption. Certificate improvements for setting serial number, key usage and extended key usage. Refactor of SSL_ and hash types to allow openssl coexistence. Improvements for TLS 1.3. Fixes for OCSP stapling to allow disable and WOLFSSL specific user context for callbacks. Fixes for openssl and MySQL compatibility. Updated Micrium port. Fixes for asynchronous modes. + +- Fix to not send OCSP stapling extensions in client_hello when not enabled +- Added new API's for disabling OCSP stapling +- Add check for SIZEOF_LONG with sun and LP64 +- Fixes for various TLS 1.3 disable options (RSA, ECC and ED/Curve 25519). +- Fix to disallow upgrading to TLS v1.3 +- Fixes for wolfSSL_EVP_CipherFinal() when message size is a round multiple of a block size. +- Add HMAC benchmark and expanded AES key size benchmarks +- Added simple GCC ARM Makefile example +- Add tests for 3072-bit RSA and DH. +- Fixed DRAFT_18 define and fixed downgrading with TLS v1.3 +- Fixes to allow custom serial number during certificate generation +- Add method to get WOLFSSL_CTX certificate manager +- Improvement to `wolfSSL_SetOCSP_Cb` to allow context per WOLFSSL object +- Alternate certificate chain support `WOLFSSL_ALT_CERT_CHAINS`. Enables checking cert against multiple CA's. +- Added new `--disable-oldnames` option to allow for using openssl along-side wolfssl headers (without OPENSSL_EXTRA). +- Refactor SSL_ and hashing types to use wolf specific prefix (WOLFSSL and WC_) to allow openssl coexistence. +- Fixes for HAVE_INTEL_MULX +- Cleanup include paths for MySQL cmake build +- Added configure option for building library for wolfSSH (--enable-wolfssh) +- Openssl compatibility layer improvements +- Expanded API unit tests +- Fixes for STM32 crypto hardware acceleration +- Added AES XTS mode (--enable-xts) +- Added ASN Extended Key Usage Support (see wc_SetExtKeyUsage). +- Math updates and added TFM_MIPS speedup. +- Fix for creation of the KeyUsage BitString +- Fix for 8k keys with MySQL compatibility +- Fixes for ATECC508A. +- Fixes for PIC32MZ hashing. +- Fixes and improvements to asynchronous modes for Intel QuickAssist and Cavium Nitrox V. +- Update HASH_DRBG Reseed mechanism and add test case +- Rename the file io.h/io.c to wolfio.h/wolfio.c +- Cleanup the wolfIO_Send function. +- OpenSSL Compatibility Additions and Fixes +- Improvements to Visual Studio DLL project/solution. +- Added function to generate public ECC key from private key +- Added async blocking support for sniffer tool. +- Added wolfCrypt hash tests for empty string and large data. +- Added ability to use of wolf implementation of `strtok` using `USE_WOLF_STRTOK`. +- Updated Micrium uC/OS-III Port +- Updated root certs for OCSP scripts +- New Single Precision math option for RSA, DH and ECC (off by default). See `--enable-sp`. +- Speedups for AES GCM with AESNI (--enable-aesni) +- Speedups for SHA2, ChaCha20/Poly1035 using AVX/AVX2 + + ********* wolfSSL (Formerly CyaSSL) Release 3.12.0 (8/04/2017) Release 3.12.0 of wolfSSL has bug fixes and new features including: diff --git a/README.md b/README.md index 0f37485d2..ead7a9e82 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,58 @@ wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0); before calling wolfSSL_new(); Though it's not recommended. ``` +# wolfSSL (Formerly CyaSSL) Release 3.12.2 (10/20/2017) + +## Release 3.12.2 of wolfSSL has bug fixes and new features including: + +This release includes many performance improvements with Intel ASM (AVX/AVX2) and AES-NI. New single precision math option to speedup RSA, DH and ECC. Embedded hardware support has been expanded for STM32, PIC32MZ and ATECC508A. AES now supports XTS mode for disk encryption. Certificate improvements for setting serial number, key usage and extended key usage. Refactor of SSL_ and hash types to allow openssl coexistence. Improvements for TLS 1.3. Fixes for OCSP stapling to allow disable and WOLFSSL specific user context for callbacks. Fixes for openssl and MySQL compatibility. Updated Micrium port. Fixes for asynchronous modes. + +* Fix to not send OCSP stapling extensions in client_hello when not enabled +* Added new API's for disabling OCSP stapling +* Add check for SIZEOF_LONG with sun and LP64 +* Fixes for various TLS 1.3 disable options (RSA, ECC and ED/Curve 25519). +* Fix to disallow upgrading to TLS v1.3 +* Fixes for wolfSSL_EVP_CipherFinal() when message size is a round multiple of a block size. +* Add HMAC benchmark and expanded AES key size benchmarks +* Added simple GCC ARM Makefile example +* Add tests for 3072-bit RSA and DH. +* Fixed DRAFT_18 define and fixed downgrading with TLS v1.3 +* Fixes to allow custom serial number during certificate generation +* Add method to get WOLFSSL_CTX certificate manager +* Improvement to `wolfSSL_SetOCSP_Cb` to allow context per WOLFSSL object +* Alternate certificate chain support `WOLFSSL_ALT_CERT_CHAINS`. Enables checking cert against multiple CA's. +* Added new `--disable-oldnames` option to allow for using openssl along-side wolfssl headers (without OPENSSL_EXTRA). +* Refactor SSL_ and hashing types to use wolf specific prefix (WOLFSSL and WC_) to allow openssl coexistence. +* Fixes for HAVE_INTEL_MULX +* Cleanup include paths for MySQL cmake build +* Added configure option for building library for wolfSSH (--enable-wolfssh) +* Openssl compatibility layer improvements +* Expanded API unit tests +* Fixes for STM32 crypto hardware acceleration +* Added AES XTS mode (--enable-xts) +* Added ASN Extended Key Usage Support (see wc_SetExtKeyUsage). +* Math updates and added TFM_MIPS speedup. +* Fix for creation of the KeyUsage BitString +* Fix for 8k keys with MySQL compatibility +* Fixes for ATECC508A. +* Fixes for PIC32MZ hashing. +* Fixes and improvements to asynchronous modes for Intel QuickAssist and Cavium Nitrox V. +* Update HASH_DRBG Reseed mechanism and add test case +* Rename the file io.h/io.c to wolfio.h/wolfio.c +* Cleanup the wolfIO_Send function. +* OpenSSL Compatibility Additions and Fixes +* Improvements to Visual Studio DLL project/solution. +* Added function to generate public ECC key from private key +* Added async blocking support for sniffer tool. +* Added wolfCrypt hash tests for empty string and large data. +* Added ability to use of wolf implementation of `strtok` using `USE_WOLF_STRTOK`. +* Updated Micrium uC/OS-III Port +* Updated root certs for OCSP scripts +* New Single Precision math option for RSA, DH and ECC (off by default). See `--enable-sp`. +* Speedups for AES GCM with AESNI (--enable-aesni) +* Speedups for SHA2, ChaCha20/Poly1035 using AVX/AVX2 + + # wolfSSL (Formerly CyaSSL) Release 3.12.0 (8/04/2017) ## Release 3.12.0 of wolfSSL has bug fixes and new features including: diff --git a/configure.ac b/configure.ac index 04031f403..90e4db632 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,12 @@ # configure.ac # -# Copyright (C) 2006-2016 wolfSSL Inc. +# Copyright (C) 2006-2017 wolfSSL Inc. # # This file is part of wolfSSL. (formerly known as CyaSSL) # # -AC_INIT([wolfssl],[3.12.0],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[http://www.wolfssl.com]) +AC_INIT([wolfssl],[3.12.2],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[http://www.wolfssl.com]) AC_CONFIG_AUX_DIR([build-aux]) @@ -35,7 +35,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS. #shared library versioning -WOLFSSL_LIBRARY_VERSION=13:0:1 +WOLFSSL_LIBRARY_VERSION=14:0:0 # | | | # +------+ | +---+ # | | | diff --git a/ctaocrypt/src/misc.c b/ctaocrypt/src/misc.c index 854e45a3d..08a262dee 100644 --- a/ctaocrypt/src/misc.c +++ b/ctaocrypt/src/misc.c @@ -1,6 +1,6 @@ /* misc.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/ctaocrypt/src/wolfcrypt_first.c b/ctaocrypt/src/wolfcrypt_first.c index 8591f3e4d..1ee55c2a3 100644 --- a/ctaocrypt/src/wolfcrypt_first.c +++ b/ctaocrypt/src/wolfcrypt_first.c @@ -1,6 +1,6 @@ /* wolfcrypt_first.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/ctaocrypt/src/wolfcrypt_last.c b/ctaocrypt/src/wolfcrypt_last.c index d3924d4d0..63a246c61 100644 --- a/ctaocrypt/src/wolfcrypt_last.c +++ b/ctaocrypt/src/wolfcrypt_last.c @@ -1,6 +1,6 @@ /* wolfcrypt_last.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/callbacks.h b/cyassl/callbacks.h index 8608e1ed3..b9fbaf21e 100644 --- a/cyassl/callbacks.h +++ b/cyassl/callbacks.h @@ -1,6 +1,6 @@ /* callbacks.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/crl.h b/cyassl/crl.h index c19dd8be6..cd810d337 100644 --- a/cyassl/crl.h +++ b/cyassl/crl.h @@ -1,6 +1,6 @@ /* crl.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/aes.h b/cyassl/ctaocrypt/aes.h index 78ab33dcb..e7ef0741a 100644 --- a/cyassl/ctaocrypt/aes.h +++ b/cyassl/ctaocrypt/aes.h @@ -1,6 +1,6 @@ /* aes.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/arc4.h b/cyassl/ctaocrypt/arc4.h index c99eb3cbd..f4fee6cfb 100644 --- a/cyassl/ctaocrypt/arc4.h +++ b/cyassl/ctaocrypt/arc4.h @@ -1,6 +1,6 @@ /* arc4.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/asn.h b/cyassl/ctaocrypt/asn.h index 7e7a9e76d..1e7cc76c2 100644 --- a/cyassl/ctaocrypt/asn.h +++ b/cyassl/ctaocrypt/asn.h @@ -1,6 +1,6 @@ /* asn.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/asn_public.h b/cyassl/ctaocrypt/asn_public.h index ac36ca476..9de9706d3 100644 --- a/cyassl/ctaocrypt/asn_public.h +++ b/cyassl/ctaocrypt/asn_public.h @@ -1,6 +1,6 @@ /* asn_public.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/blake2-impl.h b/cyassl/ctaocrypt/blake2-impl.h index e09bc2990..56e69a7bc 100644 --- a/cyassl/ctaocrypt/blake2-impl.h +++ b/cyassl/ctaocrypt/blake2-impl.h @@ -12,7 +12,7 @@ */ /* blake2-impl.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/blake2-int.h b/cyassl/ctaocrypt/blake2-int.h index f65dda15e..656947a59 100644 --- a/cyassl/ctaocrypt/blake2-int.h +++ b/cyassl/ctaocrypt/blake2-int.h @@ -12,7 +12,7 @@ */ /* blake2-int.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/blake2.h b/cyassl/ctaocrypt/blake2.h index daa96ce73..f2f324c28 100644 --- a/cyassl/ctaocrypt/blake2.h +++ b/cyassl/ctaocrypt/blake2.h @@ -1,6 +1,6 @@ /* blake2.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/camellia.h b/cyassl/ctaocrypt/camellia.h index a42b34d06..f11391ae3 100644 --- a/cyassl/ctaocrypt/camellia.h +++ b/cyassl/ctaocrypt/camellia.h @@ -1,6 +1,6 @@ /* camellia.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/chacha.h b/cyassl/ctaocrypt/chacha.h index 2cb008b1b..219efdca8 100644 --- a/cyassl/ctaocrypt/chacha.h +++ b/cyassl/ctaocrypt/chacha.h @@ -1,6 +1,6 @@ /* chacha.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/coding.h b/cyassl/ctaocrypt/coding.h index f0007eae8..7c2f5738b 100644 --- a/cyassl/ctaocrypt/coding.h +++ b/cyassl/ctaocrypt/coding.h @@ -1,6 +1,6 @@ /* coding.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/compress.h b/cyassl/ctaocrypt/compress.h index a5682eebe..254f447da 100644 --- a/cyassl/ctaocrypt/compress.h +++ b/cyassl/ctaocrypt/compress.h @@ -1,6 +1,6 @@ /* compress.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/des3.h b/cyassl/ctaocrypt/des3.h index 40719554e..3ec998dcc 100644 --- a/cyassl/ctaocrypt/des3.h +++ b/cyassl/ctaocrypt/des3.h @@ -1,6 +1,6 @@ /* des3.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/dh.h b/cyassl/ctaocrypt/dh.h index 7dcf5de60..db7c3b6ee 100644 --- a/cyassl/ctaocrypt/dh.h +++ b/cyassl/ctaocrypt/dh.h @@ -1,6 +1,6 @@ /* dh.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/dsa.h b/cyassl/ctaocrypt/dsa.h index 33ca045e0..904baa3fd 100644 --- a/cyassl/ctaocrypt/dsa.h +++ b/cyassl/ctaocrypt/dsa.h @@ -1,6 +1,6 @@ /* dsa.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/ecc.h b/cyassl/ctaocrypt/ecc.h index 09d3db9cb..a58bbd1f1 100644 --- a/cyassl/ctaocrypt/ecc.h +++ b/cyassl/ctaocrypt/ecc.h @@ -1,6 +1,6 @@ /* ecc.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/error-crypt.h b/cyassl/ctaocrypt/error-crypt.h index bbc70f5cd..074c4712f 100644 --- a/cyassl/ctaocrypt/error-crypt.h +++ b/cyassl/ctaocrypt/error-crypt.h @@ -1,6 +1,6 @@ /* error-crypt.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/fips_test.h b/cyassl/ctaocrypt/fips_test.h index 09848cff6..6a4d2ce71 100644 --- a/cyassl/ctaocrypt/fips_test.h +++ b/cyassl/ctaocrypt/fips_test.h @@ -1,6 +1,6 @@ /* fips_test.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/hc128.h b/cyassl/ctaocrypt/hc128.h index 190f86899..bb0768e03 100644 --- a/cyassl/ctaocrypt/hc128.h +++ b/cyassl/ctaocrypt/hc128.h @@ -1,6 +1,6 @@ /* hc128.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/hmac.h b/cyassl/ctaocrypt/hmac.h index 505e44a7c..72d1ef664 100644 --- a/cyassl/ctaocrypt/hmac.h +++ b/cyassl/ctaocrypt/hmac.h @@ -1,6 +1,6 @@ /* hmac.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/integer.h b/cyassl/ctaocrypt/integer.h index e9068288a..eb556d77d 100644 --- a/cyassl/ctaocrypt/integer.h +++ b/cyassl/ctaocrypt/integer.h @@ -1,6 +1,6 @@ /* integer.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/logging.h b/cyassl/ctaocrypt/logging.h index c3a32bd2c..191fd21de 100644 --- a/cyassl/ctaocrypt/logging.h +++ b/cyassl/ctaocrypt/logging.h @@ -1,6 +1,6 @@ /* logging.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/md2.h b/cyassl/ctaocrypt/md2.h index 3b1ade15e..fefe9e7a9 100644 --- a/cyassl/ctaocrypt/md2.h +++ b/cyassl/ctaocrypt/md2.h @@ -1,6 +1,6 @@ /* md2.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/md4.h b/cyassl/ctaocrypt/md4.h index 16e4f5f46..c4ccdae57 100644 --- a/cyassl/ctaocrypt/md4.h +++ b/cyassl/ctaocrypt/md4.h @@ -1,6 +1,6 @@ /* md4.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/md5.h b/cyassl/ctaocrypt/md5.h index 6e36fe9ce..bee769c30 100644 --- a/cyassl/ctaocrypt/md5.h +++ b/cyassl/ctaocrypt/md5.h @@ -1,6 +1,6 @@ /* md5.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/memory.h b/cyassl/ctaocrypt/memory.h index 683fac98d..8623191c0 100644 --- a/cyassl/ctaocrypt/memory.h +++ b/cyassl/ctaocrypt/memory.h @@ -1,6 +1,6 @@ /* memory.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/misc.h b/cyassl/ctaocrypt/misc.h index 828d29964..a53e168c3 100644 --- a/cyassl/ctaocrypt/misc.h +++ b/cyassl/ctaocrypt/misc.h @@ -1,6 +1,6 @@ /* misc.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/mpi_class.h b/cyassl/ctaocrypt/mpi_class.h index 46855e9e4..00a71336a 100644 --- a/cyassl/ctaocrypt/mpi_class.h +++ b/cyassl/ctaocrypt/mpi_class.h @@ -1,6 +1,6 @@ /* mpi_class.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/mpi_superclass.h b/cyassl/ctaocrypt/mpi_superclass.h index bee878425..e39e3ef9c 100644 --- a/cyassl/ctaocrypt/mpi_superclass.h +++ b/cyassl/ctaocrypt/mpi_superclass.h @@ -1,6 +1,6 @@ /* mpi_superclass.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/pkcs7.h b/cyassl/ctaocrypt/pkcs7.h index afac3e9a0..2722322c6 100644 --- a/cyassl/ctaocrypt/pkcs7.h +++ b/cyassl/ctaocrypt/pkcs7.h @@ -1,6 +1,6 @@ /* pkcs7.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/poly1305.h b/cyassl/ctaocrypt/poly1305.h index 46e9bd64f..5f1de2732 100644 --- a/cyassl/ctaocrypt/poly1305.h +++ b/cyassl/ctaocrypt/poly1305.h @@ -1,6 +1,6 @@ /* poly1305.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/port/pic32/pic32mz-crypt.h b/cyassl/ctaocrypt/port/pic32/pic32mz-crypt.h index 2bbf5ce6c..187d0df65 100644 --- a/cyassl/ctaocrypt/port/pic32/pic32mz-crypt.h +++ b/cyassl/ctaocrypt/port/pic32/pic32mz-crypt.h @@ -1,6 +1,6 @@ /* pic32mz-crypt.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/pwdbased.h b/cyassl/ctaocrypt/pwdbased.h index 304287f13..f695c56ec 100644 --- a/cyassl/ctaocrypt/pwdbased.h +++ b/cyassl/ctaocrypt/pwdbased.h @@ -1,6 +1,6 @@ /* pwdbased.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/rabbit.h b/cyassl/ctaocrypt/rabbit.h index 8918962c2..86fee9c45 100644 --- a/cyassl/ctaocrypt/rabbit.h +++ b/cyassl/ctaocrypt/rabbit.h @@ -1,6 +1,6 @@ /* rabbit.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/random.h b/cyassl/ctaocrypt/random.h index f9b35d039..fbf66c8f3 100644 --- a/cyassl/ctaocrypt/random.h +++ b/cyassl/ctaocrypt/random.h @@ -1,6 +1,6 @@ /* random.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/ripemd.h b/cyassl/ctaocrypt/ripemd.h index ffc6815d6..c8417690a 100644 --- a/cyassl/ctaocrypt/ripemd.h +++ b/cyassl/ctaocrypt/ripemd.h @@ -1,6 +1,6 @@ /* ripemd.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/rsa.h b/cyassl/ctaocrypt/rsa.h index ecb7de485..5ad6fe0a3 100644 --- a/cyassl/ctaocrypt/rsa.h +++ b/cyassl/ctaocrypt/rsa.h @@ -1,6 +1,6 @@ /* rsa.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/settings.h b/cyassl/ctaocrypt/settings.h index 4de8b13ca..2a11f88ee 100644 --- a/cyassl/ctaocrypt/settings.h +++ b/cyassl/ctaocrypt/settings.h @@ -1,6 +1,6 @@ /* settings.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -54,7 +54,7 @@ /* Uncomment next line if using PIC32MZ Crypto Engine */ /* #define CYASSL_MICROCHIP_PIC32MZ */ - + /* Uncomment next line if using FreeRTOS */ /* #define FREERTOS */ @@ -84,7 +84,7 @@ /* Uncomment next line if building for EROAD */ /* #define CYASSL_EROAD */ - + /* Uncomment next line if building for IAR EWARM */ /* #define CYASSL_IAR_ARM */ @@ -111,7 +111,7 @@ /* for reverse compatibility after name change */ #include -#ifdef THREADX +#ifdef THREADX #define SIZEOF_LONG_LONG 8 #endif @@ -125,8 +125,8 @@ #define SINGLE_THREADED #define CYASSL_USER_IO #define NO_FILESYSTEM -#endif - +#endif + #if defined(CYASSL_IAR_ARM) #define NO_MAIN_DRIVER #define SINGLE_THREADED @@ -137,7 +137,7 @@ #define CYASSL_USER_IO #define BENCH_EMBEDDED #endif - + #ifdef MICROCHIP_PIC32 /* #define CYASSL_MICROCHIP_PIC32MZ */ #define SIZEOF_LONG_LONG 8 @@ -254,7 +254,7 @@ #if defined(CYASSL_LEANPSK) && !defined(XMALLOC_USER) #include #define XMALLOC(s, h, type) malloc((s)) - #define XFREE(p, h, type) free((p)) + #define XFREE(p, h, type) free((p)) #define XREALLOC(p, n, h, t) realloc((p), (n)) #endif @@ -386,7 +386,7 @@ #include "SafeRTOS/heap.h" #define XMALLOC(s, h, type) pvPortMalloc((s)) - #define XFREE(p, h, type) vPortFree((p)) + #define XFREE(p, h, type) vPortFree((p)) #define XREALLOC(p, n, h, t) pvPortRealloc((p), (n)) #endif @@ -462,7 +462,7 @@ (CPU_CHAR *)(pstr_src), (CPU_SIZE_T)(len_max))) #define XSTRNCMP(pstr_1, pstr_2, len_max) \ ((CPU_INT16S)Str_Cmp_N((CPU_CHAR *)(pstr_1), \ - (CPU_CHAR *)(pstr_2), (CPU_SIZE_T)(len_max))) + (CPU_CHAR *)(pstr_2), (CPU_SIZE_T)(len_max))) #define XSTRSTR(pstr, pstr_srch) \ ((CPU_CHAR *)Str_Str((CPU_CHAR *)(pstr), \ (CPU_CHAR *)(pstr_srch))) @@ -477,7 +477,7 @@ #define XMEMMOVE XMEMCPY #if (NET_SECURE_MGR_CFG_EN == DEF_ENABLED) - #define MICRIUM_MALLOC + #define MICRIUM_MALLOC #define XMALLOC(s, h, type) ((void *)NetSecure_BlkGet((CPU_INT08U)(type), \ (CPU_SIZE_T)(s), (void *)0)) #define XFREE(p, h, type) (NetSecure_BlkFree((CPU_INT08U)(type), \ @@ -577,13 +577,13 @@ #endif #if (SSL_CFG_USER_RNG_SEED_EN == DEF_ENABLED) - #define NO_DEV_RANDOM + #define NO_DEV_RANDOM #else #undef NO_DEV_RANDOM #endif #if (SSL_CFG_USER_IO_EN == DEF_ENABLED) - #define CYASSL_USER_IO + #define CYASSL_USER_IO #else #undef CYASSL_USER_IO #endif @@ -697,8 +697,8 @@ #define CYASSL_GENERAL_ALIGNMENT 4 #elif defined(FREESCALE_MMCAU) #define CYASSL_GENERAL_ALIGNMENT CYASSL_MMCAU_ALIGNMENT - #else - #define CYASSL_GENERAL_ALIGNMENT 0 + #else + #define CYASSL_GENERAL_ALIGNMENT 0 #endif #endif diff --git a/cyassl/ctaocrypt/settings_comp.h b/cyassl/ctaocrypt/settings_comp.h index d8384d3e3..a48f95993 100644 --- a/cyassl/ctaocrypt/settings_comp.h +++ b/cyassl/ctaocrypt/settings_comp.h @@ -1,6 +1,6 @@ /* settings_comp.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/sha.h b/cyassl/ctaocrypt/sha.h index 768acfcb5..07291b707 100644 --- a/cyassl/ctaocrypt/sha.h +++ b/cyassl/ctaocrypt/sha.h @@ -1,6 +1,6 @@ /* sha.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/sha256.h b/cyassl/ctaocrypt/sha256.h index 8f9f40f5e..1a0b6c92a 100644 --- a/cyassl/ctaocrypt/sha256.h +++ b/cyassl/ctaocrypt/sha256.h @@ -1,6 +1,6 @@ /* sha256.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/sha512.h b/cyassl/ctaocrypt/sha512.h index 7b3f646a1..d67f278d4 100644 --- a/cyassl/ctaocrypt/sha512.h +++ b/cyassl/ctaocrypt/sha512.h @@ -1,6 +1,6 @@ /* sha512.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/tfm.h b/cyassl/ctaocrypt/tfm.h index 903e07939..95229823c 100644 --- a/cyassl/ctaocrypt/tfm.h +++ b/cyassl/ctaocrypt/tfm.h @@ -1,6 +1,6 @@ /* tfm.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/types.h b/cyassl/ctaocrypt/types.h index a8a24d589..d11986c36 100644 --- a/cyassl/ctaocrypt/types.h +++ b/cyassl/ctaocrypt/types.h @@ -1,6 +1,6 @@ /* types.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/visibility.h b/cyassl/ctaocrypt/visibility.h index 4c9b2612d..62b2bd0b6 100644 --- a/cyassl/ctaocrypt/visibility.h +++ b/cyassl/ctaocrypt/visibility.h @@ -1,6 +1,6 @@ /* visibility.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ctaocrypt/wc_port.h b/cyassl/ctaocrypt/wc_port.h index 332c02cfa..cba178d6b 100644 --- a/cyassl/ctaocrypt/wc_port.h +++ b/cyassl/ctaocrypt/wc_port.h @@ -1,6 +1,6 @@ /* port.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/error-ssl.h b/cyassl/error-ssl.h index 006bb774b..4e4de5a0b 100644 --- a/cyassl/error-ssl.h +++ b/cyassl/error-ssl.h @@ -1,6 +1,6 @@ /* error-ssl.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/internal.h b/cyassl/internal.h index a2c665482..7f6f96e3e 100644 --- a/cyassl/internal.h +++ b/cyassl/internal.h @@ -1,6 +1,6 @@ /* internal.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ocsp.h b/cyassl/ocsp.h index 3741caa43..ab874e65a 100644 --- a/cyassl/ocsp.h +++ b/cyassl/ocsp.h @@ -1,6 +1,6 @@ /* ocsp.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/openssl/des.h b/cyassl/openssl/des.h index 2416cea27..0db387e47 100644 --- a/cyassl/openssl/des.h +++ b/cyassl/openssl/des.h @@ -1,6 +1,6 @@ /* des.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -21,7 +21,7 @@ -/* des.h defines mini des openssl compatibility layer +/* des.h defines mini des openssl compatibility layer * */ diff --git a/cyassl/openssl/evp.h b/cyassl/openssl/evp.h index 54335170e..fb2ae902b 100644 --- a/cyassl/openssl/evp.h +++ b/cyassl/openssl/evp.h @@ -1,6 +1,6 @@ /* evp.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -21,7 +21,7 @@ -/* evp.h defines mini evp openssl compatibility layer +/* evp.h defines mini evp openssl compatibility layer * */ diff --git a/cyassl/openssl/hmac.h b/cyassl/openssl/hmac.h index 9de057682..571c02157 100644 --- a/cyassl/openssl/hmac.h +++ b/cyassl/openssl/hmac.h @@ -1,6 +1,6 @@ /* hmac.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -21,7 +21,7 @@ -/* hmac.h defines mini hamc openssl compatibility layer +/* hmac.h defines mini hamc openssl compatibility layer * */ diff --git a/cyassl/openssl/ssl.h b/cyassl/openssl/ssl.h index bbaacd7f2..e64328466 100644 --- a/cyassl/openssl/ssl.h +++ b/cyassl/openssl/ssl.h @@ -1,6 +1,6 @@ /* ssl.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/options.h.in b/cyassl/options.h.in index c3f8012ac..e3dc1ee89 100644 --- a/cyassl/options.h.in +++ b/cyassl/options.h.in @@ -1,6 +1,6 @@ /* options.h.in * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/sniffer.h b/cyassl/sniffer.h index 6de2d64c4..046a6d82c 100644 --- a/cyassl/sniffer.h +++ b/cyassl/sniffer.h @@ -1,6 +1,6 @@ /* sniffer.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/sniffer_error.h b/cyassl/sniffer_error.h index ae5f6f075..5811c4324 100644 --- a/cyassl/sniffer_error.h +++ b/cyassl/sniffer_error.h @@ -1,6 +1,6 @@ /* sniffer_error.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/ssl.h b/cyassl/ssl.h index 0400e121c..000221b1d 100644 --- a/cyassl/ssl.h +++ b/cyassl/ssl.h @@ -1,6 +1,6 @@ /* ssl.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -493,9 +493,9 @@ /* Callbacks */ -/* +/* * Empty commment denotes not listed in CyaSSL Manual - * (soon to be wolfSSL Manual) + * (soon to be wolfSSL Manual) */ #define CyaSSL_accept_ex wolfSSL_accept_ex @@ -567,9 +567,9 @@ /* OCSP and CRL */ -/* +/* * Empty commment denotes not listed in CyaSSL Manual - * (soon to be wolfSSL Manual) + * (soon to be wolfSSL Manual) */ #define CYASSL_CRL_MONITOR WOLFSSL_CRL_MONITOR /**/ diff --git a/cyassl/version.h b/cyassl/version.h index f0d119781..32e6ba064 100644 --- a/cyassl/version.h +++ b/cyassl/version.h @@ -1,6 +1,6 @@ /* cyassl/version.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/cyassl/version.h.in b/cyassl/version.h.in index f94e815e5..de226d993 100644 --- a/cyassl/version.h.in +++ b/cyassl/version.h.in @@ -1,6 +1,6 @@ /* cyassl_version.h.in * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/examples/client/client.c b/examples/client/client.c index fcb167201..ddae145f6 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -1,6 +1,6 @@ /* client.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/examples/client/client.h b/examples/client/client.h index 39456a4f5..c8b3bcba7 100644 --- a/examples/client/client.h +++ b/examples/client/client.h @@ -1,6 +1,6 @@ /* client.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c index c4d7cb55b..382490573 100644 --- a/examples/echoclient/echoclient.c +++ b/examples/echoclient/echoclient.c @@ -1,6 +1,6 @@ /* echoclient.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/examples/echoclient/echoclient.h b/examples/echoclient/echoclient.h index 113b80021..2ad1d721a 100644 --- a/examples/echoclient/echoclient.h +++ b/examples/echoclient/echoclient.h @@ -1,6 +1,6 @@ /* echoclient.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c index 49ae57a29..ffa97f84a 100644 --- a/examples/echoserver/echoserver.c +++ b/examples/echoserver/echoserver.c @@ -1,6 +1,6 @@ /* echoserver.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/examples/echoserver/echoserver.h b/examples/echoserver/echoserver.h index f245eb09b..ecc958295 100644 --- a/examples/echoserver/echoserver.h +++ b/examples/echoserver/echoserver.h @@ -1,6 +1,6 @@ /* echoserver.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/examples/sctp/sctp-client-dtls.c b/examples/sctp/sctp-client-dtls.c index b2978a66c..9cd409169 100644 --- a/examples/sctp/sctp-client-dtls.c +++ b/examples/sctp/sctp-client-dtls.c @@ -1,6 +1,6 @@ /* sctp-client-dtls.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/examples/sctp/sctp-client.c b/examples/sctp/sctp-client.c index b601fa403..04543fbeb 100644 --- a/examples/sctp/sctp-client.c +++ b/examples/sctp/sctp-client.c @@ -1,6 +1,6 @@ /* sctp-client.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/examples/sctp/sctp-server-dtls.c b/examples/sctp/sctp-server-dtls.c index ba7b810d9..790ee691f 100644 --- a/examples/sctp/sctp-server-dtls.c +++ b/examples/sctp/sctp-server-dtls.c @@ -1,6 +1,6 @@ /* sctp-server-dtls.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/examples/sctp/sctp-server.c b/examples/sctp/sctp-server.c index fc0439d36..87d65e130 100644 --- a/examples/sctp/sctp-server.c +++ b/examples/sctp/sctp-server.c @@ -1,6 +1,6 @@ /* sctp-server.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/examples/server/server.h b/examples/server/server.h index fe37c36c5..51053fe9b 100644 --- a/examples/server/server.h +++ b/examples/server/server.h @@ -1,6 +1,6 @@ /* server.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/mcapi/crypto.c b/mcapi/crypto.c index 8ff2f5cbb..af2663024 100644 --- a/mcapi/crypto.c +++ b/mcapi/crypto.c @@ -1,6 +1,6 @@ /* crypto.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/mcapi/crypto.h b/mcapi/crypto.h index 2746b31d6..21015fd71 100644 --- a/mcapi/crypto.h +++ b/mcapi/crypto.h @@ -1,6 +1,6 @@ /* crypto.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/mcapi/mcapi_test.c b/mcapi/mcapi_test.c index e5743f131..f9f2eba32 100644 --- a/mcapi/mcapi_test.c +++ b/mcapi/mcapi_test.c @@ -1,6 +1,6 @@ /* mcapi_test.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/mplabx/benchmark_main.c b/mplabx/benchmark_main.c index 9419d6f0f..e2e454fc2 100644 --- a/mplabx/benchmark_main.c +++ b/mplabx/benchmark_main.c @@ -1,6 +1,6 @@ /* benchmark_main.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -66,9 +66,9 @@ int main(int argc, char** argv) { SYSTEMConfigPerformance(SYS_CLK); DBINIT(); - + init_serial(SYS_CLK) ; /* initialize PIC32MZ serial I/O */ - + printf("wolfCrypt Benchmark:\n"); benchmark_test(NULL); diff --git a/mplabx/test_main.c b/mplabx/test_main.c index d2cedc927..b9e4c78e6 100644 --- a/mplabx/test_main.c +++ b/mplabx/test_main.c @@ -1,6 +1,6 @@ /* main.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -77,12 +77,12 @@ void WriteCoreTimer(unsigned int t) int main(int argc, char** argv) { func_args args; - + SYSTEMConfigPerformance(SYS_CLK); DBINIT(); - + init_serial(SYS_CLK) ; /* initialize PIC32MZ serial I/O */ - + printf("WolfCrypt Test:\n"); args.argc = argc; diff --git a/rpm/spec.in b/rpm/spec.in index b1a02cb84..51af0508d 100644 --- a/rpm/spec.in +++ b/rpm/spec.in @@ -72,8 +72,8 @@ mkdir -p $RPM_BUILD_ROOT/ %{_docdir}/wolfssl/README.txt %{_libdir}/libwolfssl.la %{_libdir}/libwolfssl.so -%{_libdir}/libwolfssl.so.12 -%{_libdir}/libwolfssl.so.12.1.0 +%{_libdir}/libwolfssl.so.14 +%{_libdir}/libwolfssl.so.14.0.0 %files devel %defattr(-,root,root,-) diff --git a/src/bio.c b/src/bio.c index 6da3b9ad5..d142f4148 100644 --- a/src/bio.c +++ b/src/bio.c @@ -1,6 +1,6 @@ /* bio.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/src/crl.c b/src/crl.c index c4e51cf45..42e3e50e2 100755 --- a/src/crl.c +++ b/src/crl.c @@ -1,6 +1,6 @@ /* crl.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/src/internal.c b/src/internal.c index e58dd19b4..d8e1a4fc2 100755 --- a/src/internal.c +++ b/src/internal.c @@ -1,6 +1,6 @@ /* internal.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/src/keys.c b/src/keys.c index c50ad39cc..3e24c77d2 100644 --- a/src/keys.c +++ b/src/keys.c @@ -1,6 +1,6 @@ /* keys.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/src/ocsp.c b/src/ocsp.c index 6ae443ecf..57d47d6a7 100644 --- a/src/ocsp.c +++ b/src/ocsp.c @@ -1,6 +1,6 @@ /* ocsp.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/src/sniffer.c b/src/sniffer.c index f1b622c0c..0ab7e282c 100644 --- a/src/sniffer.c +++ b/src/sniffer.c @@ -1,6 +1,6 @@ /* sniffer.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/src/ssl.c b/src/ssl.c index 4a3b82628..5ad9ef0c1 100755 --- a/src/ssl.c +++ b/src/ssl.c @@ -1,6 +1,6 @@ /* ssl.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/src/tls.c b/src/tls.c index 829e4ad89..2fc1abb1a 100755 --- a/src/tls.c +++ b/src/tls.c @@ -1,6 +1,6 @@ /* tls.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/src/tls13.c b/src/tls13.c index 1f3fb9575..2a6bfdb98 100644 --- a/src/tls13.c +++ b/src/tls13.c @@ -1,6 +1,6 @@ /* tls13.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/src/wolfio.c b/src/wolfio.c index 31453c444..f564297c8 100644 --- a/src/wolfio.c +++ b/src/wolfio.c @@ -1,6 +1,6 @@ /* wolfio.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/sslSniffer/sslSnifferTest/snifftest.c b/sslSniffer/sslSnifferTest/snifftest.c index bcbd307da..a2aec78ef 100644 --- a/sslSniffer/sslSnifferTest/snifftest.c +++ b/sslSniffer/sslSnifferTest/snifftest.c @@ -1,6 +1,6 @@ /* snifftest.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -87,7 +87,7 @@ static void FreeAll(void) #endif } -static void sig_handler(const int sig) +static void sig_handler(const int sig) { printf("SIGINT handled = %d.\n", sig); FreeAll(); @@ -130,7 +130,7 @@ int main(int argc, char** argv) int port; int saveFile = 0; int i = 0; - int frame = ETHER_IF_FRAME_LEN; + int frame = ETHER_IF_FRAME_LEN; char err[PCAP_ERRBUF_SIZE]; char filter[32]; const char *server = NULL; @@ -185,7 +185,7 @@ int main(int argc, char** argv) switch(a->addr->sa_family) { case AF_INET: - server = + server = iptos(((struct sockaddr_in *)a->addr)->sin_addr.s_addr); printf("server = %s\n", server); break; @@ -200,14 +200,14 @@ int main(int argc, char** argv) ret = pcap_set_snaplen(pcap, 65536); if (ret != 0) printf("pcap_set_snaplen failed %s\n", pcap_geterr(pcap)); - ret = pcap_set_timeout(pcap, 1000); + ret = pcap_set_timeout(pcap, 1000); if (ret != 0) printf("pcap_set_timeout failed %s\n", pcap_geterr(pcap)); - ret = pcap_set_buffer_size(pcap, 1000000); + ret = pcap_set_buffer_size(pcap, 1000000); if (ret != 0) printf("pcap_set_buffer_size failed %s\n", pcap_geterr(pcap)); - ret = pcap_set_promisc(pcap, 1); + ret = pcap_set_promisc(pcap, 1); if (ret != 0) printf("pcap_set_promisc failed %s\n", pcap_geterr(pcap)); @@ -288,7 +288,7 @@ int main(int argc, char** argv) if (ret != 0) err_sys(err); - if (pcap_datalink(pcap) == DLT_NULL) + if (pcap_datalink(pcap) == DLT_NULL) frame = NULL_IF_FRAME_LEN; while (1) { @@ -302,7 +302,7 @@ int main(int argc, char** argv) if (header.caplen > 40) { /* min ip(20) + min tcp(20) */ packet += frame; - header.caplen -= frame; + header.caplen -= frame; } else continue; diff --git a/swig/wolfssl.i b/swig/wolfssl.i index d46134177..ffc9b385b 100644 --- a/swig/wolfssl.i +++ b/swig/wolfssl.i @@ -1,6 +1,6 @@ /* wolfssl.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/swig/wolfssl_adds.c b/swig/wolfssl_adds.c index 13bfbdbcc..d038473e4 100644 --- a/swig/wolfssl_adds.c +++ b/swig/wolfssl_adds.c @@ -1,6 +1,6 @@ /* wolfssl_adds.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/tests/api.c b/tests/api.c index 4c9b3df5e..39160e24c 100644 --- a/tests/api.c +++ b/tests/api.c @@ -1,6 +1,6 @@ /* api.c API unit tests * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/tests/hash.c b/tests/hash.c index 362bec802..f29e95603 100644 --- a/tests/hash.c +++ b/tests/hash.c @@ -1,6 +1,6 @@ /* hash.c has unit tests * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/tests/srp.c b/tests/srp.c index 31cdcb655..2f4078316 100644 --- a/tests/srp.c +++ b/tests/srp.c @@ -1,6 +1,6 @@ /* srp.c SRP unit tests * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/tests/suites.c b/tests/suites.c index c701f2471..c8dcdf8f7 100644 --- a/tests/suites.c +++ b/tests/suites.c @@ -1,6 +1,6 @@ /* suites.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/tests/unit.c b/tests/unit.c index 39a76ddf2..0f1e09adb 100644 --- a/tests/unit.c +++ b/tests/unit.c @@ -1,6 +1,6 @@ /* unit.c API unit tests driver * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/tests/unit.h b/tests/unit.h index c28afe1d7..bdbed5da7 100644 --- a/tests/unit.h +++ b/tests/unit.h @@ -1,6 +1,6 @@ /* unit.c API unit tests driver * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c index b014c48f0..18f290906 100644 --- a/testsuite/testsuite.c +++ b/testsuite/testsuite.c @@ -1,6 +1,6 @@ /* testsuite.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c index 078e00bfd..872cb9ecc 100644 --- a/wolfcrypt/benchmark/benchmark.c +++ b/wolfcrypt/benchmark/benchmark.c @@ -1,6 +1,6 @@ /* benchmark.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/benchmark/benchmark.h b/wolfcrypt/benchmark/benchmark.h index cc76b7297..2fc43eec8 100644 --- a/wolfcrypt/benchmark/benchmark.h +++ b/wolfcrypt/benchmark/benchmark.h @@ -1,6 +1,6 @@ /* wolfcrypt/benchmark/benchmark.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -89,7 +89,7 @@ void bench_ntruKeyGen(void); void bench_rng(void); void bench_blake2(void); - + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c index ffe52c5e5..2684d8a8d 100755 --- a/wolfcrypt/src/aes.c +++ b/wolfcrypt/src/aes.c @@ -1,6 +1,6 @@ /* aes.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/aes_asm.s b/wolfcrypt/src/aes_asm.s index 0be550b2f..1791837b7 100644 --- a/wolfcrypt/src/aes_asm.s +++ b/wolfcrypt/src/aes_asm.s @@ -1,6 +1,6 @@ /* aes_asm.s * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/arc4.c b/wolfcrypt/src/arc4.c index 2eacf5509..3a7e1e7c8 100644 --- a/wolfcrypt/src/arc4.c +++ b/wolfcrypt/src/arc4.c @@ -1,6 +1,6 @@ /* arc4.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/asm.c b/wolfcrypt/src/asm.c index 62824672b..c409230ec 100644 --- a/wolfcrypt/src/asm.c +++ b/wolfcrypt/src/asm.c @@ -1,6 +1,6 @@ /* asm.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c index f96722733..1411e6c71 100644 --- a/wolfcrypt/src/asn.c +++ b/wolfcrypt/src/asn.c @@ -1,6 +1,6 @@ /* asn.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/blake2b.c b/wolfcrypt/src/blake2b.c index f30b685af..2c99c2a75 100644 --- a/wolfcrypt/src/blake2b.c +++ b/wolfcrypt/src/blake2b.c @@ -12,7 +12,7 @@ */ /* blake2b.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -110,7 +110,7 @@ int blake2b_init_param( blake2b_state *S, const blake2b_param *P ) byte *p ; blake2b_init0( S ); p = ( byte * )( P ); - + /* IV XOR ParamBlock */ for( i = 0; i < 8; ++i ) S->h[i] ^= load64( p + sizeof( S->h[i] ) * i ); diff --git a/wolfcrypt/src/camellia.c b/wolfcrypt/src/camellia.c index 5f8dd07a7..cff40a80b 100644 --- a/wolfcrypt/src/camellia.c +++ b/wolfcrypt/src/camellia.c @@ -27,7 +27,7 @@ /* camellia.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/chacha.c b/wolfcrypt/src/chacha.c index 45b0bbeef..efec1359b 100644 --- a/wolfcrypt/src/chacha.c +++ b/wolfcrypt/src/chacha.c @@ -1,6 +1,6 @@ /* chacha.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/chacha20_poly1305.c b/wolfcrypt/src/chacha20_poly1305.c index 104bb5737..1b2289c54 100644 --- a/wolfcrypt/src/chacha20_poly1305.c +++ b/wolfcrypt/src/chacha20_poly1305.c @@ -1,6 +1,6 @@ /* chacha.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/cmac.c b/wolfcrypt/src/cmac.c index 79b13fc43..69e2f385b 100644 --- a/wolfcrypt/src/cmac.c +++ b/wolfcrypt/src/cmac.c @@ -1,6 +1,6 @@ /* cmac.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -145,7 +145,7 @@ int wc_CmacFinal(Cmac* cmac, byte* out, word32* outSz) *outSz = AES_BLOCK_SIZE; ForceZero(cmac, sizeof(Cmac)); - return 0; + return 0; } diff --git a/wolfcrypt/src/coding.c b/wolfcrypt/src/coding.c index 43cb45d06..6e5f443dc 100644 --- a/wolfcrypt/src/coding.c +++ b/wolfcrypt/src/coding.c @@ -1,6 +1,6 @@ /* coding.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/compress.c b/wolfcrypt/src/compress.c index 2423a0402..68eb4c0ef 100644 --- a/wolfcrypt/src/compress.c +++ b/wolfcrypt/src/compress.c @@ -1,6 +1,6 @@ /* compress.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -73,12 +73,12 @@ int wc_Compress(byte* out, word32 outSz, const byte* in, word32 inSz, word32 fla * outSz - size of destination buffer * in - pointer to source buffer to compress * inSz - size of source to compress - * flags - flags to control how compress operates + * flags - flags to control how compress operates * * return: * negative - error code * positive - bytes stored in out buffer - * + * * Note, the output buffer still needs to be larger than the input buffer. * The right chunk of data won't compress at all, and the lookup table will * add to the size of the output. The libz code says the compressed @@ -127,12 +127,12 @@ int wc_DeCompress(byte* out, word32 outSz, const byte* in, word32 inSz) * outSz - size of destination buffer * in - pointer to source buffer to compress * inSz - size of source to compress - * flags - flags to control how compress operates + * flags - flags to control how compress operates * * return: * negative - error code * positive - bytes stored in out buffer - */ + */ { z_stream stream; int result = 0; @@ -157,7 +157,7 @@ int wc_DeCompress(byte* out, word32 outSz, const byte* in, word32 inSz) inflateEnd(&stream); return DECOMPRESS_E; } - + result = (int)stream.total_out; if (inflateEnd(&stream) != Z_OK) diff --git a/wolfcrypt/src/cpuid.c b/wolfcrypt/src/cpuid.c index ef5af424a..f65eac600 100644 --- a/wolfcrypt/src/cpuid.c +++ b/wolfcrypt/src/cpuid.c @@ -1,6 +1,6 @@ /* cpuid.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/curve25519.c b/wolfcrypt/src/curve25519.c index ae6bef770..c265df3a0 100644 --- a/wolfcrypt/src/curve25519.c +++ b/wolfcrypt/src/curve25519.c @@ -1,6 +1,6 @@ /* curve25519.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/des3.c b/wolfcrypt/src/des3.c index d5642a099..ab07fde65 100755 --- a/wolfcrypt/src/des3.c +++ b/wolfcrypt/src/des3.c @@ -1,6 +1,6 @@ /* des3.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/dh.c b/wolfcrypt/src/dh.c index b4609c44b..744fb4cc8 100755 --- a/wolfcrypt/src/dh.c +++ b/wolfcrypt/src/dh.c @@ -1,6 +1,6 @@ /* dh.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/dsa.c b/wolfcrypt/src/dsa.c index c6c446508..f75258f6d 100644 --- a/wolfcrypt/src/dsa.c +++ b/wolfcrypt/src/dsa.c @@ -1,6 +1,6 @@ /* dsa.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/ecc.c b/wolfcrypt/src/ecc.c index 604f3cdae..d55bce4f5 100755 --- a/wolfcrypt/src/ecc.c +++ b/wolfcrypt/src/ecc.c @@ -1,6 +1,6 @@ /* ecc.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/ed25519.c b/wolfcrypt/src/ed25519.c index 8e2c032a5..abc92b9c8 100644 --- a/wolfcrypt/src/ed25519.c +++ b/wolfcrypt/src/ed25519.c @@ -1,6 +1,6 @@ /* ed25519.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/error.c b/wolfcrypt/src/error.c index 554de6812..83e9e3f9d 100644 --- a/wolfcrypt/src/error.c +++ b/wolfcrypt/src/error.c @@ -1,6 +1,6 @@ /* error.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/evp.c b/wolfcrypt/src/evp.c index f1f651ec1..5fcd0d201 100644 --- a/wolfcrypt/src/evp.c +++ b/wolfcrypt/src/evp.c @@ -1,6 +1,6 @@ /* evp.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fe_low_mem.c b/wolfcrypt/src/fe_low_mem.c index ba45282af..77d3607a9 100644 --- a/wolfcrypt/src/fe_low_mem.c +++ b/wolfcrypt/src/fe_low_mem.c @@ -1,6 +1,6 @@ /* fe_low_mem.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fe_operations.c b/wolfcrypt/src/fe_operations.c index f02301186..26893772d 100755 --- a/wolfcrypt/src/fe_operations.c +++ b/wolfcrypt/src/fe_operations.c @@ -1,6 +1,6 @@ /* fe_operations.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_mont_small.i b/wolfcrypt/src/fp_mont_small.i index c39925e20..bd24d0f1b 100644 --- a/wolfcrypt/src/fp_mont_small.i +++ b/wolfcrypt/src/fp_mont_small.i @@ -1,6 +1,6 @@ /* fp_mont_small.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_mul_comba_12.i b/wolfcrypt/src/fp_mul_comba_12.i index b6c8e9830..7cdcf596f 100644 --- a/wolfcrypt/src/fp_mul_comba_12.i +++ b/wolfcrypt/src/fp_mul_comba_12.i @@ -1,6 +1,6 @@ /* fp_mul_comba_12.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_mul_comba_17.i b/wolfcrypt/src/fp_mul_comba_17.i index ba4ee0913..503560e6f 100644 --- a/wolfcrypt/src/fp_mul_comba_17.i +++ b/wolfcrypt/src/fp_mul_comba_17.i @@ -1,6 +1,6 @@ /* fp_mul_comba_17.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_mul_comba_20.i b/wolfcrypt/src/fp_mul_comba_20.i index 7d2275abb..bd008b15c 100644 --- a/wolfcrypt/src/fp_mul_comba_20.i +++ b/wolfcrypt/src/fp_mul_comba_20.i @@ -1,6 +1,6 @@ /* fp_mul_comba_20.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_mul_comba_24.i b/wolfcrypt/src/fp_mul_comba_24.i index 3502151f6..b37ee7822 100644 --- a/wolfcrypt/src/fp_mul_comba_24.i +++ b/wolfcrypt/src/fp_mul_comba_24.i @@ -1,6 +1,6 @@ /* fp_mul_comba_24.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_mul_comba_28.i b/wolfcrypt/src/fp_mul_comba_28.i index 41ef1bc9a..0e6a65cb9 100644 --- a/wolfcrypt/src/fp_mul_comba_28.i +++ b/wolfcrypt/src/fp_mul_comba_28.i @@ -1,6 +1,6 @@ /* fp_mul_comba_28.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_mul_comba_3.i b/wolfcrypt/src/fp_mul_comba_3.i index fb0ca1203..a628b503d 100644 --- a/wolfcrypt/src/fp_mul_comba_3.i +++ b/wolfcrypt/src/fp_mul_comba_3.i @@ -1,6 +1,6 @@ /* fp_mul_comba_3.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_mul_comba_32.i b/wolfcrypt/src/fp_mul_comba_32.i index f1e54116d..9a97af04f 100644 --- a/wolfcrypt/src/fp_mul_comba_32.i +++ b/wolfcrypt/src/fp_mul_comba_32.i @@ -1,6 +1,6 @@ /* fp_mul_comba_32.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_mul_comba_4.i b/wolfcrypt/src/fp_mul_comba_4.i index 8c34cc9e3..536f5ffa1 100644 --- a/wolfcrypt/src/fp_mul_comba_4.i +++ b/wolfcrypt/src/fp_mul_comba_4.i @@ -1,6 +1,6 @@ /* fp_mul_comba_4.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_mul_comba_48.i b/wolfcrypt/src/fp_mul_comba_48.i index 91df8f835..20653bdfc 100644 --- a/wolfcrypt/src/fp_mul_comba_48.i +++ b/wolfcrypt/src/fp_mul_comba_48.i @@ -1,6 +1,6 @@ /* fp_mul_comba_48.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_mul_comba_6.i b/wolfcrypt/src/fp_mul_comba_6.i index c953f4d02..a453c988e 100644 --- a/wolfcrypt/src/fp_mul_comba_6.i +++ b/wolfcrypt/src/fp_mul_comba_6.i @@ -1,6 +1,6 @@ /* fp_mul_comba_6.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_mul_comba_64.i b/wolfcrypt/src/fp_mul_comba_64.i index 981675980..2f2da7911 100644 --- a/wolfcrypt/src/fp_mul_comba_64.i +++ b/wolfcrypt/src/fp_mul_comba_64.i @@ -1,6 +1,6 @@ /* fp_mul_comba_64.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_mul_comba_7.i b/wolfcrypt/src/fp_mul_comba_7.i index b7dd9c1da..84da50d2b 100644 --- a/wolfcrypt/src/fp_mul_comba_7.i +++ b/wolfcrypt/src/fp_mul_comba_7.i @@ -1,6 +1,6 @@ /* fp_mul_comba_7.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_mul_comba_8.i b/wolfcrypt/src/fp_mul_comba_8.i index aa0428a5b..1c919f954 100644 --- a/wolfcrypt/src/fp_mul_comba_8.i +++ b/wolfcrypt/src/fp_mul_comba_8.i @@ -1,6 +1,6 @@ /* fp_mul_comba_8.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_mul_comba_9.i b/wolfcrypt/src/fp_mul_comba_9.i index 4f443908b..175130e0a 100644 --- a/wolfcrypt/src/fp_mul_comba_9.i +++ b/wolfcrypt/src/fp_mul_comba_9.i @@ -1,6 +1,6 @@ /* fp_mul_comba_9.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_mul_comba_small_set.i b/wolfcrypt/src/fp_mul_comba_small_set.i index 4e948c7cd..46cc4e5ad 100644 --- a/wolfcrypt/src/fp_mul_comba_small_set.i +++ b/wolfcrypt/src/fp_mul_comba_small_set.i @@ -1,6 +1,6 @@ /* fp_mul_comba_small_set.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_sqr_comba_12.i b/wolfcrypt/src/fp_sqr_comba_12.i index 31c06606c..256071073 100644 --- a/wolfcrypt/src/fp_sqr_comba_12.i +++ b/wolfcrypt/src/fp_sqr_comba_12.i @@ -1,6 +1,6 @@ /* fp_sqr_comba_12.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_sqr_comba_17.i b/wolfcrypt/src/fp_sqr_comba_17.i index 167636b6b..1d612de48 100644 --- a/wolfcrypt/src/fp_sqr_comba_17.i +++ b/wolfcrypt/src/fp_sqr_comba_17.i @@ -1,6 +1,6 @@ /* fp_sqr_comba_17.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_sqr_comba_20.i b/wolfcrypt/src/fp_sqr_comba_20.i index 9355c51c1..fbe929f5b 100644 --- a/wolfcrypt/src/fp_sqr_comba_20.i +++ b/wolfcrypt/src/fp_sqr_comba_20.i @@ -1,6 +1,6 @@ /* fp_sqr_comba_20.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_sqr_comba_24.i b/wolfcrypt/src/fp_sqr_comba_24.i index 3beec1be6..5e7d6ee96 100644 --- a/wolfcrypt/src/fp_sqr_comba_24.i +++ b/wolfcrypt/src/fp_sqr_comba_24.i @@ -1,6 +1,6 @@ /* fp_sqr_comba_24.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_sqr_comba_28.i b/wolfcrypt/src/fp_sqr_comba_28.i index 41dd07b33..c1dc316cb 100644 --- a/wolfcrypt/src/fp_sqr_comba_28.i +++ b/wolfcrypt/src/fp_sqr_comba_28.i @@ -1,6 +1,6 @@ /* fp_sqr_comba_28.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_sqr_comba_3.i b/wolfcrypt/src/fp_sqr_comba_3.i index 065916e1f..bde53e05e 100644 --- a/wolfcrypt/src/fp_sqr_comba_3.i +++ b/wolfcrypt/src/fp_sqr_comba_3.i @@ -1,6 +1,6 @@ /* fp_sqr_comba_3.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_sqr_comba_32.i b/wolfcrypt/src/fp_sqr_comba_32.i index 936995bd6..6042027e8 100644 --- a/wolfcrypt/src/fp_sqr_comba_32.i +++ b/wolfcrypt/src/fp_sqr_comba_32.i @@ -1,6 +1,6 @@ /* fp_sqr_comba_32.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_sqr_comba_4.i b/wolfcrypt/src/fp_sqr_comba_4.i index 35f4d1c3d..e00500db2 100644 --- a/wolfcrypt/src/fp_sqr_comba_4.i +++ b/wolfcrypt/src/fp_sqr_comba_4.i @@ -1,6 +1,6 @@ /* fp_sqr_comba_4.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_sqr_comba_48.i b/wolfcrypt/src/fp_sqr_comba_48.i index 9ccf2b6f0..a3d127bdb 100644 --- a/wolfcrypt/src/fp_sqr_comba_48.i +++ b/wolfcrypt/src/fp_sqr_comba_48.i @@ -1,6 +1,6 @@ /* fp_sqr_comba_48.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_sqr_comba_6.i b/wolfcrypt/src/fp_sqr_comba_6.i index 4ea5d05f1..aa80e9774 100644 --- a/wolfcrypt/src/fp_sqr_comba_6.i +++ b/wolfcrypt/src/fp_sqr_comba_6.i @@ -1,6 +1,6 @@ /* fp_sqr_comba_6.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_sqr_comba_64.i b/wolfcrypt/src/fp_sqr_comba_64.i index 24dd4ac8a..a6e57a380 100644 --- a/wolfcrypt/src/fp_sqr_comba_64.i +++ b/wolfcrypt/src/fp_sqr_comba_64.i @@ -1,6 +1,6 @@ /* fp_sqr_comba_64.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_sqr_comba_7.i b/wolfcrypt/src/fp_sqr_comba_7.i index 2797a6bac..fdd6cf276 100644 --- a/wolfcrypt/src/fp_sqr_comba_7.i +++ b/wolfcrypt/src/fp_sqr_comba_7.i @@ -1,6 +1,6 @@ /* fp_sqr_comba_7.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_sqr_comba_8.i b/wolfcrypt/src/fp_sqr_comba_8.i index bee58a895..43a9192ca 100644 --- a/wolfcrypt/src/fp_sqr_comba_8.i +++ b/wolfcrypt/src/fp_sqr_comba_8.i @@ -1,6 +1,6 @@ /* fp_sqr_comba_8.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_sqr_comba_9.i b/wolfcrypt/src/fp_sqr_comba_9.i index c6813b382..18d8773f9 100644 --- a/wolfcrypt/src/fp_sqr_comba_9.i +++ b/wolfcrypt/src/fp_sqr_comba_9.i @@ -1,6 +1,6 @@ /* fp_sqr_comba_9.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/fp_sqr_comba_small_set.i b/wolfcrypt/src/fp_sqr_comba_small_set.i index d9687f0e8..9b53ed9b4 100644 --- a/wolfcrypt/src/fp_sqr_comba_small_set.i +++ b/wolfcrypt/src/fp_sqr_comba_small_set.i @@ -1,6 +1,6 @@ /* fp_sqr_comba_small_set.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/ge_low_mem.c b/wolfcrypt/src/ge_low_mem.c index e66ba1d9e..59931178c 100644 --- a/wolfcrypt/src/ge_low_mem.c +++ b/wolfcrypt/src/ge_low_mem.c @@ -1,6 +1,6 @@ /* ge_low_mem.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/ge_operations.c b/wolfcrypt/src/ge_operations.c index f692ac31c..2c19ee7c2 100644 --- a/wolfcrypt/src/ge_operations.c +++ b/wolfcrypt/src/ge_operations.c @@ -1,6 +1,6 @@ /* ge_operations.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/hash.c b/wolfcrypt/src/hash.c index 9a6c9f222..bdbc2c23e 100644 --- a/wolfcrypt/src/hash.c +++ b/wolfcrypt/src/hash.c @@ -1,6 +1,6 @@ /* hash.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/hc128.c b/wolfcrypt/src/hc128.c index 11fe27468..59739bba1 100644 --- a/wolfcrypt/src/hc128.c +++ b/wolfcrypt/src/hc128.c @@ -1,6 +1,6 @@ /* hc128.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -73,7 +73,7 @@ (ctx->T[(u)]) += tem2+(tem0 ^ tem1); \ (ctx->X[(a)]) = (ctx->T[(u)]); \ (n) = tem3 ^ (ctx->T[(u)]) ; \ -} +} /*one step of HC-128, update Q and generate 32 bits keystream*/ #define step_Q(ctx,u,v,a,b,c,d,n){ \ @@ -85,17 +85,17 @@ (ctx->T[(u)]) += tem2 + (tem0 ^ tem1); \ (ctx->Y[(a)]) = (ctx->T[(u)]); \ (n) = tem3 ^ (ctx->T[(u)]) ; \ -} +} /*16 steps of HC-128, generate 512 bits keystream*/ -static void generate_keystream(HC128* ctx, word32* keystream) +static void generate_keystream(HC128* ctx, word32* keystream) { word32 cc,dd; cc = ctx->counter1024 & 0x1ff; dd = (cc+16)&0x1ff; - if (ctx->counter1024 < 512) - { + if (ctx->counter1024 < 512) + { ctx->counter1024 = (ctx->counter1024 + 16) & 0x3ff; step_P(ctx, cc+0, cc+1, 0, 6, 13,4, keystream[0]); step_P(ctx, cc+1, cc+2, 1, 7, 14,5, keystream[1]); @@ -114,7 +114,7 @@ static void generate_keystream(HC128* ctx, word32* keystream) step_P(ctx, cc+14,cc+15,14,4, 11,2, keystream[14]); step_P(ctx, cc+15,dd+0, 15,5, 12,3, keystream[15]); } - else + else { ctx->counter1024 = (ctx->counter1024 + 16) & 0x3ff; step_Q(ctx, 512+cc+0, 512+cc+1, 0, 6, 13,4, keystream[0]); @@ -150,7 +150,7 @@ static void generate_keystream(HC128* ctx, word32* keystream) h1((ctx),(ctx->X[(d)]),tem3); \ (ctx->T[(u)]) = ((ctx->T[(u)]) + tem2+(tem0^tem1)) ^ tem3; \ (ctx->X[(a)]) = (ctx->T[(u)]); \ -} +} /*update table Q*/ #define update_Q(ctx,u,v,a,b,c,d){ \ @@ -161,7 +161,7 @@ static void generate_keystream(HC128* ctx, word32* keystream) h2((ctx),(ctx->Y[(d)]),tem3); \ (ctx->T[(u)]) = ((ctx->T[(u)]) + tem2+(tem0^tem1)) ^ tem3; \ (ctx->Y[(a)]) = (ctx->T[(u)]); \ -} +} /*16 steps of HC-128, without generating keystream, */ /*but use the outputs to update P and Q*/ @@ -171,8 +171,8 @@ static void setup_update(HC128* ctx) /*each time 16 steps*/ cc = ctx->counter1024 & 0x1ff; dd = (cc+16)&0x1ff; - if (ctx->counter1024 < 512) - { + if (ctx->counter1024 < 512) + { ctx->counter1024 = (ctx->counter1024 + 16) & 0x3ff; update_P(ctx, cc+0, cc+1, 0, 6, 13, 4); update_P(ctx, cc+1, cc+2, 1, 7, 14, 5); @@ -189,9 +189,9 @@ static void setup_update(HC128* ctx) /*each time 16 steps*/ update_P(ctx, cc+12,cc+13,12,2, 9, 0); update_P(ctx, cc+13,cc+14,13,3, 10, 1); update_P(ctx, cc+14,cc+15,14,4, 11, 2); - update_P(ctx, cc+15,dd+0, 15,5, 12, 3); + update_P(ctx, cc+15,dd+0, 15,5, 12, 3); } - else + else { ctx->counter1024 = (ctx->counter1024 + 16) & 0x3ff; update_Q(ctx, 512+cc+0, 512+cc+1, 0, 6, 13, 4); @@ -209,8 +209,8 @@ static void setup_update(HC128* ctx) /*each time 16 steps*/ update_Q(ctx, 512+cc+12,512+cc+13,12,2, 9, 0); update_Q(ctx, 512+cc+13,512+cc+14,13,3, 10, 1); update_Q(ctx, 512+cc+14,512+cc+15,14,4, 11, 2); - update_Q(ctx, 512+cc+15,512+dd+0, 15,5, 12, 3); - } + update_Q(ctx, 512+cc+15,512+dd+0, 15,5, 12, 3); + } } @@ -232,7 +232,7 @@ static void setup_update(HC128* ctx) /*each time 16 steps*/ static void Hc128_SetIV(HC128* ctx, const byte* inIv) -{ +{ word32 i; word32 iv[4]; @@ -240,46 +240,46 @@ static void Hc128_SetIV(HC128* ctx, const byte* inIv) XMEMCPY(iv, inIv, sizeof(iv)); else XMEMSET(iv, 0, sizeof(iv)); - + for (i = 0; i < (128 >> 5); i++) ctx->iv[i] = LITTLE32(iv[i]); - + for (; i < 8; i++) ctx->iv[i] = ctx->iv[i-4]; - - /* expand the key and IV into the table T */ - /* (expand the key and IV into the table P and Q) */ - + + /* expand the key and IV into the table T */ + /* (expand the key and IV into the table P and Q) */ + for (i = 0; i < 8; i++) ctx->T[i] = ctx->key[i]; for (i = 8; i < 16; i++) ctx->T[i] = ctx->iv[i-8]; - for (i = 16; i < (256+16); i++) + for (i = 16; i < (256+16); i++) ctx->T[i] = f2(ctx->T[i-2]) + ctx->T[i-7] + f1(ctx->T[i-15]) + ctx->T[i-16]+i; - + for (i = 0; i < 16; i++) ctx->T[i] = ctx->T[256+i]; - for (i = 16; i < 1024; i++) + for (i = 16; i < 1024; i++) ctx->T[i] = f2(ctx->T[i-2]) + ctx->T[i-7] + f1(ctx->T[i-15]) + ctx->T[i-16]+256+i; - + /* initialize counter1024, X and Y */ ctx->counter1024 = 0; for (i = 0; i < 16; i++) ctx->X[i] = ctx->T[512-16+i]; for (i = 0; i < 16; i++) ctx->Y[i] = ctx->T[512+512-16+i]; - + /* run the cipher 1024 steps before generating the output */ - for (i = 0; i < 64; i++) setup_update(ctx); + for (i = 0; i < 64; i++) setup_update(ctx); } static INLINE int DoKey(HC128* ctx, const byte* key, const byte* iv) -{ - word32 i; +{ + word32 i; - /* Key size in bits 128 */ + /* Key size in bits 128 */ for (i = 0; i < (128 >> 5); i++) ctx->key[i] = LITTLE32(((word32*)key)[i]); - + for ( ; i < 8 ; i++) ctx->key[i] = ctx->key[i-4]; Hc128_SetIV(ctx, iv); @@ -372,7 +372,7 @@ static INLINE int DoProcess(HC128* ctx, byte* output, const byte* input, { word32 wordsLeft = msglen / sizeof(word32); if (msglen % sizeof(word32)) wordsLeft++; - + ByteReverseWords(keystream, keystream, wordsLeft * sizeof(word32)); } #endif diff --git a/wolfcrypt/src/hmac.c b/wolfcrypt/src/hmac.c index 74ac602bc..e7fa2a612 100755 --- a/wolfcrypt/src/hmac.c +++ b/wolfcrypt/src/hmac.c @@ -1,6 +1,6 @@ /* hmac.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/idea.c b/wolfcrypt/src/idea.c index 550a51465..708c4e919 100644 --- a/wolfcrypt/src/idea.c +++ b/wolfcrypt/src/idea.c @@ -1,6 +1,6 @@ /* idea.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/integer.c b/wolfcrypt/src/integer.c index 4122166e3..1c66245f9 100644 --- a/wolfcrypt/src/integer.c +++ b/wolfcrypt/src/integer.c @@ -1,6 +1,6 @@ /* integer.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/logging.c b/wolfcrypt/src/logging.c index 9a15974e5..c27abb6c8 100644 --- a/wolfcrypt/src/logging.c +++ b/wolfcrypt/src/logging.c @@ -1,6 +1,6 @@ /* logging.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/md2.c b/wolfcrypt/src/md2.c index 01f8f48aa..3bb45f638 100644 --- a/wolfcrypt/src/md2.c +++ b/wolfcrypt/src/md2.c @@ -1,6 +1,6 @@ /* md2.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -51,7 +51,7 @@ void wc_InitMd2(Md2* md2) void wc_Md2Update(Md2* md2, const byte* data, word32 len) { - static const byte S[256] = + static const byte S[256] = { 41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6, 19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188, diff --git a/wolfcrypt/src/md4.c b/wolfcrypt/src/md4.c index bac424065..437d2e82d 100644 --- a/wolfcrypt/src/md4.c +++ b/wolfcrypt/src/md4.c @@ -1,6 +1,6 @@ /* md4.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -80,7 +80,7 @@ static void Transform(Md4* md4) function(C,D,A,B,14,11); function(B,C,D,A,15,19); -#undef function +#undef function #define function(a,b,c,d,k,s) \ a=rotlFixed(a+G(b,c,d)+md4->buffer[k]+0x5a827999,s); @@ -101,7 +101,7 @@ static void Transform(Md4* md4) function(C,D,A,B,11, 9); function(B,C,D,A,15,13); -#undef function +#undef function #define function(a,b,c,d,k,s) \ a=rotlFixed(a+H(b,c,d)+md4->buffer[k]+0x6ed9eba1,s); @@ -121,7 +121,7 @@ static void Transform(Md4* md4) function(D,A,B,C,11, 9); function(C,D,A,B, 7,11); function(B,C,D,A,15,15); - + /* Add the working vars back into digest state[] */ md4->digest[0] += A; md4->digest[1] += B; @@ -183,9 +183,9 @@ void wc_Md4Final(Md4* md4, byte* hash) md4->buffLen = 0; } XMEMSET(&local[md4->buffLen], 0, MD4_PAD_SIZE - md4->buffLen); - + /* put lengths in bits */ - md4->hiLen = (md4->loLen >> (8*sizeof(md4->loLen) - 3)) + + md4->hiLen = (md4->loLen >> (8*sizeof(md4->loLen) - 3)) + (md4->hiLen << 3); md4->loLen = md4->loLen << 3; diff --git a/wolfcrypt/src/md5.c b/wolfcrypt/src/md5.c index b19f0bf4d..e9f041c7b 100755 --- a/wolfcrypt/src/md5.c +++ b/wolfcrypt/src/md5.c @@ -1,6 +1,6 @@ /* md5.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/memory.c b/wolfcrypt/src/memory.c index 32a676d6a..a57894d58 100644 --- a/wolfcrypt/src/memory.c +++ b/wolfcrypt/src/memory.c @@ -1,6 +1,6 @@ /* memory.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/misc.c b/wolfcrypt/src/misc.c index 08ba55e86..a79245a0a 100644 --- a/wolfcrypt/src/misc.c +++ b/wolfcrypt/src/misc.c @@ -1,6 +1,6 @@ /* misc.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/pkcs12.c b/wolfcrypt/src/pkcs12.c index 45409ae66..2ca721922 100644 --- a/wolfcrypt/src/pkcs12.c +++ b/wolfcrypt/src/pkcs12.c @@ -1,6 +1,6 @@ /* pkcs12.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c index 91bbde6c7..63c794ba7 100755 --- a/wolfcrypt/src/pkcs7.c +++ b/wolfcrypt/src/pkcs7.c @@ -1,6 +1,6 @@ /* pkcs7.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/poly1305.c b/wolfcrypt/src/poly1305.c index d704a52e0..4ae56bfc0 100644 --- a/wolfcrypt/src/poly1305.c +++ b/wolfcrypt/src/poly1305.c @@ -1,6 +1,6 @@ /* poly1305.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -922,7 +922,7 @@ POLY1305_NOINLINE static void poly1305_blocks_avx2(Poly1305* ctx, r[2] = (word32)( r1 >> 8 ) & 0x3ffffff; \ r[3] = (word32)((r1 >> 34) | (r2 << 10)) & 0x3ffffff; \ r[4] = (word32)( r2 >> 16 ) - + static void poly1305_setkey_avx2(Poly1305* ctx, const byte* key) { diff --git a/wolfcrypt/src/port/arm/armv8-aes.c b/wolfcrypt/src/port/arm/armv8-aes.c index 535239647..6838ffcb6 100644 --- a/wolfcrypt/src/port/arm/armv8-aes.c +++ b/wolfcrypt/src/port/arm/armv8-aes.c @@ -1,6 +1,6 @@ /* armv8-aes.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/port/arm/armv8-sha256.c b/wolfcrypt/src/port/arm/armv8-sha256.c index 2115ddcb9..66e9d5c99 100644 --- a/wolfcrypt/src/port/arm/armv8-sha256.c +++ b/wolfcrypt/src/port/arm/armv8-sha256.c @@ -1,6 +1,6 @@ /* armv8-sha256.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/port/atmel/atmel.c b/wolfcrypt/src/port/atmel/atmel.c index 4c5ed0dcc..66beac6fa 100644 --- a/wolfcrypt/src/port/atmel/atmel.c +++ b/wolfcrypt/src/port/atmel/atmel.c @@ -1,6 +1,6 @@ /* atmel.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -112,7 +112,7 @@ long atmel_get_curr_time_and_date(long* tm) //rtc_calendar_get_time(_rtc_instance[0], &rtcTime); /* Convert rtc_calendar_time to seconds since UTC */ - + return 0; } @@ -219,7 +219,7 @@ void atmel_init(void) atcatls_init(&cfg_ateccx08a_i2c_default); /* Init the I2C pipe encryption key. */ - /* Value is generated/stored during pair for the ATECC508A and stored + /* Value is generated/stored during pair for the ATECC508A and stored on micro flash */ /* For this example its a fixed value */ if (atmel_init_enc_key() != ATCA_SUCCESS) { diff --git a/wolfcrypt/src/port/nrf51.c b/wolfcrypt/src/port/nrf51.c index 1d51c268b..bc43d550e 100644 --- a/wolfcrypt/src/port/nrf51.c +++ b/wolfcrypt/src/port/nrf51.c @@ -1,6 +1,6 @@ /* nrf51.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/port/nxp/ksdk_port.c b/wolfcrypt/src/port/nxp/ksdk_port.c index 4c5853d7b..be3eb9e1f 100644 --- a/wolfcrypt/src/port/nxp/ksdk_port.c +++ b/wolfcrypt/src/port/nxp/ksdk_port.c @@ -1,6 +1,6 @@ /* ksdk_port.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/port/pic32/pic32mz-crypt.c b/wolfcrypt/src/port/pic32/pic32mz-crypt.c index fb04c4b9b..ca6dc206d 100644 --- a/wolfcrypt/src/port/pic32/pic32mz-crypt.c +++ b/wolfcrypt/src/port/pic32/pic32mz-crypt.c @@ -1,6 +1,6 @@ /* pic32mz-crypt.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/port/ti/ti-aes.c b/wolfcrypt/src/port/ti/ti-aes.c index cd8d2eed9..cbb6d9de2 100644 --- a/wolfcrypt/src/port/ti/ti-aes.c +++ b/wolfcrypt/src/port/ti/ti-aes.c @@ -1,6 +1,6 @@ /* port/ti/ti-aes.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA */ - + #ifdef HAVE_CONFIG_H #include #endif @@ -66,14 +66,14 @@ WOLFSSL_API int wc_AesSetKey(Aes* aes, const byte* key, word32 len, const byte* return BAD_FUNC_ARG; if(!((dir == AES_ENCRYPTION) || (dir == AES_DECRYPTION))) return BAD_FUNC_ARG; - + switch(len) { case 16: aes->keylen = AES_CFG_KEY_SIZE_128BIT ; break ; case 24: aes->keylen = AES_CFG_KEY_SIZE_192BIT ; break ; case 32: aes->keylen = AES_CFG_KEY_SIZE_256BIT ; break ; - default: return BAD_FUNC_ARG; + default: return BAD_FUNC_ARG; } - + XMEMCPY(aes->key, key, len) ; #ifdef WOLFSSL_AES_COUNTER aes->left = 0; @@ -85,10 +85,10 @@ WOLFSSL_API int wc_AesSetKey(Aes* aes, const byte* key, word32 len, const byte* #define IS_ALIGN16(p) (((unsigned int)(p)&0xf) == 0) static int AesAlign16(Aes* aes, byte* out, const byte* in, word32 sz, word32 dir, word32 mode) -{ +{ wolfSSL_TI_lockCCM() ; ROM_AESReset(AES_BASE); - ROM_AESConfigSet(AES_BASE, (aes->keylen | dir | + ROM_AESConfigSet(AES_BASE, (aes->keylen | dir | (mode==AES_CFG_MODE_CTR_NOCTR ? AES_CFG_MODE_CTR : mode))); ROM_AESIVSet(AES_BASE, (uint32_t *)aes->reg); ROM_AESKey1Set(AES_BASE, (uint32_t *)aes->key, aes->keylen); @@ -97,7 +97,7 @@ static int AesAlign16(Aes* aes, byte* out, const byte* in, word32 sz, word32 di XMEMCPY(aes->tmp, in + sz - AES_BLOCK_SIZE, AES_BLOCK_SIZE); ROM_AESDataProcess(AES_BASE, (uint32_t *)in, (uint32_t *)out, sz); wolfSSL_TI_unlockCCM() ; - + /* store iv for next call */ if(mode == AES_CFG_MODE_CBC){ if(dir == AES_CFG_DIR_ENCRYPT) @@ -107,7 +107,7 @@ static int AesAlign16(Aes* aes, byte* out, const byte* in, word32 sz, word32 di } if(mode == AES_CFG_MODE_CTR) { - do { + do { int i ; for (i = AES_BLOCK_SIZE - 1; i >= 0; i--) { if (++((byte *)aes->reg)[i]) @@ -121,12 +121,12 @@ static int AesAlign16(Aes* aes, byte* out, const byte* in, word32 sz, word32 di } static int AesProcess(Aes* aes, byte* out, const byte* in, word32 sz, word32 dir, word32 mode) -{ - const byte * in_p ; byte * out_p ; +{ + const byte * in_p ; byte * out_p ; word32 size ; #define TI_BUFFSIZE 1024 byte buff[TI_BUFFSIZE] ; - + if ((aes == NULL) || (in == NULL) || (out == NULL)) return BAD_FUNC_ARG; if(sz % AES_BLOCK_SIZE) @@ -136,16 +136,16 @@ static int AesProcess(Aes* aes, byte* out, const byte* in, word32 sz, word32 di size = sz ; in_p = in ; out_p = out ; if(!IS_ALIGN16(in)){ size = sz>TI_BUFFSIZE ? TI_BUFFSIZE : sz ; - XMEMCPY(buff, in, size) ; + XMEMCPY(buff, in, size) ; in_p = (const byte *)buff ; } if(!IS_ALIGN16(out)){ size = sz>TI_BUFFSIZE ? TI_BUFFSIZE : sz ; out_p = buff ; } - + AesAlign16(aes, out_p, in_p, size, dir, mode) ; - + if(!IS_ALIGN16(out)){ XMEMCPY(out, buff, size) ; } @@ -156,18 +156,18 @@ static int AesProcess(Aes* aes, byte* out, const byte* in, word32 sz, word32 di } WOLFSSL_API int wc_AesCbcEncrypt(Aes* aes, byte* out, const byte* in, word32 sz) -{ +{ return AesProcess(aes, out, in, sz, AES_CFG_DIR_ENCRYPT, AES_CFG_MODE_CBC) ; } WOLFSSL_API int wc_AesCbcDecrypt(Aes* aes, byte* out, const byte* in, word32 sz) -{ +{ return AesProcess(aes, out, in, sz, AES_CFG_DIR_DECRYPT, AES_CFG_MODE_CBC) ; } #ifdef WOLFSSL_AES_COUNTER WOLFSSL_API void wc_AesCtrEncrypt(Aes* aes, byte* out, const byte* in, word32 sz) -{ +{ char out_block[AES_BLOCK_SIZE] ; int odd ; int even ; @@ -182,7 +182,7 @@ WOLFSSL_API void wc_AesCtrEncrypt(Aes* aes, byte* out, const byte* in, word32 sz } XMEMCPY(tmp+aes->left, in, odd) ; if((odd+aes->left) == AES_BLOCK_SIZE){ - AesProcess(aes, (byte *)out_block, (byte const *)tmp, AES_BLOCK_SIZE, + AesProcess(aes, (byte *)out_block, (byte const *)tmp, AES_BLOCK_SIZE, AES_CFG_DIR_ENCRYPT, AES_CFG_MODE_CTR) ; XMEMCPY(out, out_block+aes->left, odd) ; aes->left = 0 ; @@ -202,8 +202,8 @@ WOLFSSL_API void wc_AesCtrEncrypt(Aes* aes, byte* out, const byte* in, word32 sz if(odd) { XMEMSET(tmp+aes->left, 0x0, AES_BLOCK_SIZE - aes->left) ; XMEMCPY(tmp+aes->left, in, odd) ; - AesProcess(aes, (byte *)out_block, (byte const *)tmp, AES_BLOCK_SIZE, - AES_CFG_DIR_ENCRYPT, + AesProcess(aes, (byte *)out_block, (byte const *)tmp, AES_BLOCK_SIZE, + AES_CFG_DIR_ENCRYPT, AES_CFG_MODE_CTR_NOCTR /* Counter mode without counting IV */ ); XMEMCPY(out, out_block+aes->left,odd) ; @@ -256,7 +256,7 @@ static int AesAuthArgCheck(Aes* aes, byte* out, const byte* in, word32 inSz, return BAD_FUNC_ARG; if((inSz != 0) && ((out == NULL)||(in == NULL))) return BAD_FUNC_ARG; - + switch(authTagSz){ case 4: *M = AES_CFG_CCM_M_4; break ; @@ -304,24 +304,24 @@ static void AesAuthSetIv(Aes *aes, const byte *nonce, word32 len, word32 L, int if(mode == AES_CFG_MODE_CCM){ XMEMSET(aes->reg, 0, 16) ; switch(L){ - case AES_CFG_CCM_L_8: + case AES_CFG_CCM_L_8: aes->reg[0] = 0x7; break ; - case AES_CFG_CCM_L_7: + case AES_CFG_CCM_L_7: aes->reg[0] = 0x6; break ; - case AES_CFG_CCM_L_6: + case AES_CFG_CCM_L_6: aes->reg[0] = 0x5; break ; - case AES_CFG_CCM_L_5: + case AES_CFG_CCM_L_5: aes->reg[0] = 0x4; break ; - case AES_CFG_CCM_L_4: + case AES_CFG_CCM_L_4: aes->reg[0] = 0x3; break ; - case AES_CFG_CCM_L_3: + case AES_CFG_CCM_L_3: aes->reg[0] = 0x2; break ; - case AES_CFG_CCM_L_2: + case AES_CFG_CCM_L_2: aes->reg[0] = 0x1; break ; - case AES_CFG_CCM_L_1: + case AES_CFG_CCM_L_1: aes->reg[0] = 0x0; break ; } - XMEMCPY(((byte *)aes->reg)+1, nonce, len) ; + XMEMCPY(((byte *)aes->reg)+1, nonce, len) ; } else { byte *b = (byte *)aes->reg ; XMEMSET(aes->reg, 0, AES_BLOCK_SIZE); @@ -344,7 +344,7 @@ static int AesAuthEncrypt(Aes* aes, byte* out, const byte* in, word32 inSz, const byte* nonce, word32 nonceSz, byte* authTag, word32 authTagSz, const byte* authIn, word32 authInSz, int mode) -{ +{ word32 M, L ; byte *in_a, *in_save ; byte *out_a, *out_save ; @@ -355,26 +355,26 @@ static int AesAuthEncrypt(Aes* aes, byte* out, const byte* in, word32 inSz, if(AesAuthArgCheck(aes, out, in, inSz, nonce, nonceSz, authTag, authTagSz, authIn, authInSz, &M, &L) == BAD_FUNC_ARG)return BAD_FUNC_ARG ; - + /* 16 byte padding */ in_save = NULL ; out_save = NULL ; authIn_save = NULL ; nonce_save = NULL ; if((inSz%16)==0){ in_save = NULL ; in_a = (byte *)in ; out_save = NULL ; out_a = out ; } else { - if((in_save = XMALLOC(RoundUp16(inSz), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL){ + if((in_save = XMALLOC(RoundUp16(inSz), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL){ FREE_ALL; return MEMORY_E ; } in_a = in_save ; XMEMSET(in_a, 0, RoundUp16(inSz)) ; XMEMCPY(in_a, in, inSz) ; - - if((out_save = XMALLOC(RoundUp16(inSz), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL){ - FREE_ALL; return MEMORY_E ; } - out_a = out_save ; + + if((out_save = XMALLOC(RoundUp16(inSz), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL){ + FREE_ALL; return MEMORY_E ; } + out_a = out_save ; } - + if((authInSz%16)==0){ authIn_save = NULL ; authIn_a = (byte *)authIn ; } else { - if((authIn_save = XMALLOC(RoundUp16(authInSz), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL){ + if((authIn_save = XMALLOC(RoundUp16(authInSz), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL){ FREE_ALL; return MEMORY_E ; } authIn_a = authIn_save ; XMEMSET(authIn_a, 0, RoundUp16(authInSz)) ; XMEMCPY(authIn_a, authIn, authInSz) ; } @@ -382,7 +382,7 @@ static int AesAuthEncrypt(Aes* aes, byte* out, const byte* in, word32 inSz, if((nonceSz%16)==0){ nonce_save = NULL ; nonce_a = (byte *)nonce ; } else { - if((nonce_save = XMALLOC(RoundUp16(nonceSz), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL){ + if((nonce_save = XMALLOC(RoundUp16(nonceSz), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL){ FREE_ALL; return MEMORY_E; } nonce_a = nonce_save ; XMEMSET(nonce_a, 0, RoundUp16(nonceSz)) ; XMEMCPY(nonce_a, nonce, nonceSz) ; } @@ -405,7 +405,7 @@ static int AesAuthEncrypt(Aes* aes, byte* out, const byte* in, word32 inSz, XMEMCPY(authTag, tmpTag, authTagSz) ; } - FREE_ALL; + FREE_ALL; return 0 ; } @@ -413,7 +413,7 @@ static int AesAuthDecrypt(Aes* aes, byte* out, const byte* in, word32 inSz, const byte* nonce, word32 nonceSz, const byte* authTag, word32 authTagSz, const byte* authIn, word32 authInSz, int mode) -{ +{ word32 M, L ; byte *in_a, *in_save ; byte *out_a, *out_save ; @@ -424,26 +424,26 @@ static int AesAuthDecrypt(Aes* aes, byte* out, const byte* in, word32 inSz, if(AesAuthArgCheck(aes, out, in, inSz, nonce, nonceSz, authTag, authTagSz, authIn, authInSz, &M, &L) == BAD_FUNC_ARG)return BAD_FUNC_ARG ; - + /* 16 byte padding */ in_save = NULL ; out_save = NULL ; authIn_save = NULL ; nonce_save = NULL ; if((inSz%16)==0){ in_save = NULL ; in_a = (byte *)in ; out_save = NULL ; out_a = out ; } else { - if((in_save = XMALLOC(RoundUp16(inSz), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL){ + if((in_save = XMALLOC(RoundUp16(inSz), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL){ FREE_ALL; return MEMORY_E;} in_a = in_save ; XMEMSET(in_a, 0, RoundUp16(inSz)) ; XMEMCPY(in_a, in, inSz) ; - - if((out_save = XMALLOC(RoundUp16(inSz), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL){ + + if((out_save = XMALLOC(RoundUp16(inSz), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL){ FREE_ALL; return MEMORY_E;} - out_a = out_save ; + out_a = out_save ; } - + if((authInSz%16)==0){ authIn_save = NULL ; authIn_a = (byte *)authIn ; } else { - if((authIn_save = XMALLOC(RoundUp16(authInSz), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL){ + if((authIn_save = XMALLOC(RoundUp16(authInSz), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL){ FREE_ALL; return MEMORY_E; } authIn_a = authIn_save ; XMEMSET(authIn_a, 0, RoundUp16(authInSz)) ; XMEMCPY(authIn_a, authIn, authInSz) ; } @@ -451,7 +451,7 @@ static int AesAuthDecrypt(Aes* aes, byte* out, const byte* in, word32 inSz, if((nonceSz%16)==0){ nonce_save = NULL ; nonce_a = (byte *)nonce ; } else { - if((nonce_save = XMALLOC(RoundUp16(nonceSz), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL){ + if((nonce_save = XMALLOC(RoundUp16(nonceSz), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL){ FREE_ALL; return MEMORY_E; } nonce_a = nonce_save ; XMEMSET(nonce_a, 0, RoundUp16(nonceSz)) ; XMEMCPY(nonce_a, nonce, nonceSz) ; } @@ -470,7 +470,7 @@ static int AesAuthDecrypt(Aes* aes, byte* out, const byte* in, word32 inSz, XMEMSET(out, 0, inSz) ; ret = false ; } else { - XMEMCPY(out, out_a, inSz) ; + XMEMCPY(out, out_a, inSz) ; } FREE_ALL ; @@ -500,7 +500,7 @@ WOLFSSL_API int wc_AesGcmDecrypt(Aes* aes, byte* out, const byte* in, word32 sz const byte* iv, word32 ivSz, const byte* authTag, word32 authTagSz, const byte* authIn, word32 authInSz) -{ +{ return AesAuthDecrypt(aes, out, in, sz, iv, ivSz, authTag, authTagSz, authIn, authInSz, AES_CFG_MODE_GCM_HY0CALC) ; } @@ -530,7 +530,7 @@ WOLFSSL_API int wc_AesCcmEncrypt(Aes* aes, byte* out, const byte* in, word32 inS const byte* nonce, word32 nonceSz, byte* authTag, word32 authTagSz, const byte* authIn, word32 authInSz) -{ +{ return AesAuthEncrypt(aes, out, in, inSz, nonce, nonceSz, authTag, authTagSz, authIn, authInSz, AES_CFG_MODE_CCM) ; } @@ -539,7 +539,7 @@ WOLFSSL_API int wc_AesCcmDecrypt(Aes* aes, byte* out, const byte* in, word32 inS const byte* nonce, word32 nonceSz, const byte* authTag, word32 authTagSz, const byte* authIn, word32 authInSz) -{ +{ return AesAuthDecrypt(aes, out, in, inSz, nonce, nonceSz, authTag, authTagSz, authIn, authInSz, AES_CFG_MODE_CCM) ; } diff --git a/wolfcrypt/src/port/ti/ti-ccm.c b/wolfcrypt/src/port/ti/ti-ccm.c index f4a4c6595..a57ea565e 100644 --- a/wolfcrypt/src/port/ti/ti-ccm.c +++ b/wolfcrypt/src/port/ti/ti-ccm.c @@ -1,6 +1,6 @@ /* port/ti/ti_ccm.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/port/ti/ti-des3.c b/wolfcrypt/src/port/ti/ti-des3.c index 177cd1ba1..5904fc2fe 100644 --- a/wolfcrypt/src/port/ti/ti-des3.c +++ b/wolfcrypt/src/port/ti/ti-des3.c @@ -1,6 +1,6 @@ /* port/ti/ti-des.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -64,13 +64,13 @@ static int DesSetKey(Des* des, const byte* key, const byte* iv,int dir, int tri return BAD_FUNC_ARG; if(!((dir == DES_ENCRYPTION) || (dir == DES_DECRYPTION))) return BAD_FUNC_ARG; - + XMEMCPY(des->key, key, tri == DES_CFG_SINGLE ? DES_KEYLEN : DES3_KEYLEN) ; return DesSetIV(des, iv, tri); } static int DesCbcAlign16(Des* des, byte* out, const byte* in, word32 sz, word32 dir, word32 tri) -{ +{ wolfSSL_TI_lockCCM() ; ROM_DESReset(DES_BASE); @@ -82,21 +82,21 @@ static int DesCbcAlign16(Des* des, byte* out, const byte* in, word32 sz, word32 XMEMCPY(des->tmp, in + sz - DES_BLOCK_SIZE, DES_BLOCK_SIZE); ROM_DESDataProcess(DES_BASE, (uint32_t *)in, (uint32_t *)out, sz); wolfSSL_TI_unlockCCM() ; - + /* store iv for next call */ if(dir == DES_CFG_DIR_ENCRYPT) XMEMCPY(des->reg, out + sz - DES_BLOCK_SIZE, DES_BLOCK_SIZE); else XMEMCPY(des->reg, des->tmp, DES_BLOCK_SIZE); - + return 0 ; } #define IS_ALIGN16(p) (((unsigned int)(p)&0xf) == 0) static int DesCbc(Des* des, byte* out, const byte* in, word32 sz, word32 dir, word32 tri) -{ - const byte * in_p ; byte * out_p ; +{ + const byte * in_p ; byte * out_p ; word32 size ; #define TI_BUFFSIZE 1024 byte buff[TI_BUFFSIZE] ; @@ -104,21 +104,21 @@ static int DesCbc(Des* des, byte* out, const byte* in, word32 sz, word32 dir, w return BAD_FUNC_ARG; if(sz % DES_BLOCK_SIZE) return BAD_FUNC_ARG; - + while(sz > 0) { size = sz ; in_p = in ; out_p = out ; if(!IS_ALIGN16(in)){ size = sz>TI_BUFFSIZE ? TI_BUFFSIZE : sz ; - XMEMCPY(buff, in, size) ; + XMEMCPY(buff, in, size) ; in_p = (const byte *)buff ; } if(!IS_ALIGN16(out)){ size = sz>TI_BUFFSIZE ? TI_BUFFSIZE : sz ; out_p = (byte *)buff ; } - + DesCbcAlign16(des, out_p, in_p, size, dir, tri) ; - + if(!IS_ALIGN16(out)){ XMEMCPY(out, buff, size) ; } @@ -149,36 +149,36 @@ WOLFSSL_API int wc_Des3_SetIV(Des3* des, const byte* iv) WOLFSSL_API int wc_Des_CbcEncrypt(Des* des, byte* out, const byte* in, word32 sz) -{ +{ return DesCbc(des, out, in, sz, DES_CFG_DIR_ENCRYPT, DES_CFG_SINGLE) ; } WOLFSSL_API int wc_Des_CbcDecrypt(Des* des, byte* out, const byte* in, word32 sz) -{ +{ return DesCbc(des, out, in, sz, DES_CFG_DIR_DECRYPT, DES_CFG_SINGLE) ; } WOLFSSL_API int wc_Des_CbcDecryptWithKey(byte* out, const byte* in, word32 sz, const byte* key, const byte* iv) -{ - (void)out; (void)in; (void)sz; (void)key; (void)iv ; +{ + (void)out; (void)in; (void)sz; (void)key; (void)iv ; return -1 ; } WOLFSSL_API int wc_Des3_CbcEncrypt(Des3* des, byte* out, const byte* in, word32 sz) -{ +{ return DesCbc((Des *)des, out, in, sz, DES_CFG_DIR_ENCRYPT, DES_CFG_TRIPLE) ; } WOLFSSL_API int wc_Des3_CbcDecrypt(Des3* des, byte* out, const byte* in, word32 sz) -{ +{ return DesCbc((Des *)des, out, in, sz, DES_CFG_DIR_DECRYPT, DES_CFG_TRIPLE) ; } WOLFSSL_API int wc_Des3_CbcDecryptWithKey(byte* out, const byte* in, word32 sz, const byte* key, const byte* iv) -{ - (void)out; (void)in; (void)sz; (void)key; (void)iv ; +{ + (void)out; (void)in; (void)sz; (void)key; (void)iv ; return -1 ; } diff --git a/wolfcrypt/src/port/ti/ti-hash.c b/wolfcrypt/src/port/ti/ti-hash.c index b5e1ccdb8..11aab2a51 100644 --- a/wolfcrypt/src/port/ti/ti-hash.c +++ b/wolfcrypt/src/port/ti/ti-hash.c @@ -1,6 +1,6 @@ /* port/ti/ti-hash.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/port/xilinx/xil-aesgcm.c b/wolfcrypt/src/port/xilinx/xil-aesgcm.c index 8d0e2f6b1..8af2a4c02 100755 --- a/wolfcrypt/src/port/xilinx/xil-aesgcm.c +++ b/wolfcrypt/src/port/xilinx/xil-aesgcm.c @@ -1,6 +1,6 @@ /* xil-aesgcm.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/port/xilinx/xil-sha3.c b/wolfcrypt/src/port/xilinx/xil-sha3.c index 151d89522..8e6b58184 100755 --- a/wolfcrypt/src/port/xilinx/xil-sha3.c +++ b/wolfcrypt/src/port/xilinx/xil-sha3.c @@ -1,6 +1,6 @@ /* xil-sha3.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/pwdbased.c b/wolfcrypt/src/pwdbased.c index 3af55439d..0626136b3 100644 --- a/wolfcrypt/src/pwdbased.c +++ b/wolfcrypt/src/pwdbased.c @@ -1,6 +1,6 @@ /* pwdbased.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/rabbit.c b/wolfcrypt/src/rabbit.c index b7601eb04..9875a357a 100644 --- a/wolfcrypt/src/rabbit.c +++ b/wolfcrypt/src/rabbit.c @@ -1,6 +1,6 @@ /* rabbit.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/random.c b/wolfcrypt/src/random.c index 46f617b6a..420f254db 100644 --- a/wolfcrypt/src/random.c +++ b/wolfcrypt/src/random.c @@ -1,6 +1,6 @@ /* random.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/ripemd.c b/wolfcrypt/src/ripemd.c index 0958ea477..a865ac4a4 100644 --- a/wolfcrypt/src/ripemd.c +++ b/wolfcrypt/src/ripemd.c @@ -1,6 +1,6 @@ /* ripemd.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -60,7 +60,7 @@ int wc_InitRipeMd(RipeMd* ripemd) /* for all */ -#define F(x, y, z) (x ^ y ^ z) +#define F(x, y, z) (x ^ y ^ z) #define G(x, y, z) (z ^ (x & (y^z))) #define H(x, y, z) (z ^ (x | ~y)) #define I(x, y, z) (y ^ (z & (x^y))) @@ -194,7 +194,7 @@ static void Transform(RipeMd* ripemd) Subround(J, b2, c2, d2, e2, a2, ripemd->buffer[ 3], 12, k5); Subround(J, a2, b2, c2, d2, e2, ripemd->buffer[12], 6, k5); - Subround(I, e2, a2, b2, c2, d2, ripemd->buffer[ 6], 9, k6); + Subround(I, e2, a2, b2, c2, d2, ripemd->buffer[ 6], 9, k6); Subround(I, d2, e2, a2, b2, c2, ripemd->buffer[11], 13, k6); Subround(I, c2, d2, e2, a2, b2, ripemd->buffer[ 3], 15, k6); Subround(I, b2, c2, d2, e2, a2, ripemd->buffer[ 7], 7, k6); @@ -283,11 +283,11 @@ int wc_RipeMdUpdate(RipeMd* ripemd, const byte* data, word32 len) { /* do block size increments */ byte* local; - + if (ripemd == NULL || (data == NULL && len > 0)) { return BAD_FUNC_ARG; } - + local = (byte*)ripemd->buffer; while (len) { @@ -315,11 +315,11 @@ int wc_RipeMdUpdate(RipeMd* ripemd, const byte* data, word32 len) int wc_RipeMdFinal(RipeMd* ripemd, byte* hash) { byte* local; - + if (ripemd == NULL || hash == NULL) { return BAD_FUNC_ARG; } - + local = (byte*)ripemd->buffer; AddLength(ripemd, ripemd->buffLen); /* before adding pads */ @@ -338,10 +338,10 @@ int wc_RipeMdFinal(RipeMd* ripemd, byte* hash) ripemd->buffLen = 0; } XMEMSET(&local[ripemd->buffLen], 0, RIPEMD_PAD_SIZE - ripemd->buffLen); - + /* put lengths in bits */ ripemd->loLen = ripemd->loLen << 3; - ripemd->hiLen = (ripemd->loLen >> (8*sizeof(ripemd->loLen) - 3)) + + ripemd->hiLen = (ripemd->loLen >> (8*sizeof(ripemd->loLen) - 3)) + (ripemd->hiLen << 3); /* store lengths */ @@ -350,7 +350,7 @@ int wc_RipeMdFinal(RipeMd* ripemd, byte* hash) #endif /* ! length ordering dependent on digest endian type ! */ XMEMCPY(&local[RIPEMD_PAD_SIZE], &ripemd->loLen, sizeof(word32)); - XMEMCPY(&local[RIPEMD_PAD_SIZE + sizeof(word32)], &ripemd->hiLen, + XMEMCPY(&local[RIPEMD_PAD_SIZE + sizeof(word32)], &ripemd->hiLen, sizeof(word32)); Transform(ripemd); diff --git a/wolfcrypt/src/rsa.c b/wolfcrypt/src/rsa.c index 79a98cb89..0e803138e 100755 --- a/wolfcrypt/src/rsa.c +++ b/wolfcrypt/src/rsa.c @@ -1,6 +1,6 @@ /* rsa.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/sha.c b/wolfcrypt/src/sha.c index 2e6c0abbf..8f7255f26 100755 --- a/wolfcrypt/src/sha.c +++ b/wolfcrypt/src/sha.c @@ -1,6 +1,6 @@ /* sha.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/sha256.c b/wolfcrypt/src/sha256.c index a5a154375..470914cf1 100755 --- a/wolfcrypt/src/sha256.c +++ b/wolfcrypt/src/sha256.c @@ -1,6 +1,6 @@ /* sha256.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/sha3.c b/wolfcrypt/src/sha3.c index 26c1a4337..2d51eaa90 100755 --- a/wolfcrypt/src/sha3.c +++ b/wolfcrypt/src/sha3.c @@ -1,6 +1,6 @@ /* sha3.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -438,11 +438,11 @@ static int Sha3Update(Sha3* sha3, const byte* data, word32 len, byte p) for (i = 0; i < l; i++) t[i] = data[i]; data += i; - len -= i; + len -= i; sha3->i += i; if (sha3->i == p * 8) - { + { for (i = 0; i < p; i++) sha3->s[i] ^= Load64BitBigEndian(sha3->t + 8 * i); BlockSha3(sha3->s); diff --git a/wolfcrypt/src/sha3_long.i b/wolfcrypt/src/sha3_long.i index eaa4c7502..a456314eb 100644 --- a/wolfcrypt/src/sha3_long.i +++ b/wolfcrypt/src/sha3_long.i @@ -1,6 +1,6 @@ /* sha_long.i * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/sha512.c b/wolfcrypt/src/sha512.c index f8e82db1f..7bb1bf33f 100755 --- a/wolfcrypt/src/sha512.c +++ b/wolfcrypt/src/sha512.c @@ -1,6 +1,6 @@ /* sha512.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/signature.c b/wolfcrypt/src/signature.c index 5d430d3de..e5cd5c365 100644 --- a/wolfcrypt/src/signature.c +++ b/wolfcrypt/src/signature.c @@ -1,6 +1,6 @@ /* signature.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/srp.c b/wolfcrypt/src/srp.c index ab45a0f49..d6d73617c 100644 --- a/wolfcrypt/src/srp.c +++ b/wolfcrypt/src/srp.c @@ -1,6 +1,6 @@ /* srp.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/tfm.c b/wolfcrypt/src/tfm.c index a5172d54c..5f4df8cd9 100644 --- a/wolfcrypt/src/tfm.c +++ b/wolfcrypt/src/tfm.c @@ -1,6 +1,6 @@ /* tfm.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/wc_encrypt.c b/wolfcrypt/src/wc_encrypt.c index c736f14b0..1928a6868 100644 --- a/wolfcrypt/src/wc_encrypt.c +++ b/wolfcrypt/src/wc_encrypt.c @@ -1,6 +1,6 @@ /* wc_encrypt.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/wc_port.c b/wolfcrypt/src/wc_port.c index 6d28158f8..284ed507e 100755 --- a/wolfcrypt/src/wc_port.c +++ b/wolfcrypt/src/wc_port.c @@ -1,6 +1,6 @@ /* port.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/wolfevent.c b/wolfcrypt/src/wolfevent.c index e5f74fe5b..c949824bc 100644 --- a/wolfcrypt/src/wolfevent.c +++ b/wolfcrypt/src/wolfevent.c @@ -1,6 +1,6 @@ /* wolfevent.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/wolfmath.c b/wolfcrypt/src/wolfmath.c index bb76bfe81..8e6a0b4d1 100644 --- a/wolfcrypt/src/wolfmath.c +++ b/wolfcrypt/src/wolfmath.c @@ -1,6 +1,6 @@ /* wolfmath.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index 909eb954e..cb82e6ea6 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -1,6 +1,6 @@ /* test.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/test/test.h b/wolfcrypt/test/test.h index d65b27f4f..5fe571cd5 100644 --- a/wolfcrypt/test/test.h +++ b/wolfcrypt/test/test.h @@ -1,6 +1,6 @@ /* wolfcrypt/test/test.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/user-crypto/include/user_rsa.h b/wolfcrypt/user-crypto/include/user_rsa.h index f3df13cad..bf15fa9f5 100644 --- a/wolfcrypt/user-crypto/include/user_rsa.h +++ b/wolfcrypt/user-crypto/include/user_rsa.h @@ -1,6 +1,6 @@ /* user_rsa.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/user-crypto/src/rsa.c b/wolfcrypt/user-crypto/src/rsa.c index fac942d3b..e3a1a0bf7 100644 --- a/wolfcrypt/user-crypto/src/rsa.c +++ b/wolfcrypt/user-crypto/src/rsa.c @@ -1,6 +1,6 @@ /* rsa.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/callbacks.h b/wolfssl/callbacks.h index 9f3be0582..133f8325c 100644 --- a/wolfssl/callbacks.h +++ b/wolfssl/callbacks.h @@ -1,6 +1,6 @@ /* callbacks.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -34,7 +34,7 @@ enum { /* CALLBACK CONTSTANTS */ MAX_PACKETNAME_SZ = 24, MAX_CIPHERNAME_SZ = 24, - MAX_TIMEOUT_NAME_SZ = 24, + MAX_TIMEOUT_NAME_SZ = 24, MAX_PACKETS_HANDSHAKE = 14, /* 12 for client auth plus 2 alerts */ MAX_VALUE_SZ = 128, /* all handshake packets but Cert should fit here */ @@ -46,7 +46,7 @@ typedef struct handShakeInfo_st { struct WOLFSSL* ssl; char cipherName[MAX_CIPHERNAME_SZ + 1]; /* negotiated cipher */ char packetNames[MAX_PACKETS_HANDSHAKE][MAX_PACKETNAME_SZ + 1]; - /* SSL packet names */ + /* SSL packet names */ int numberPackets; /* actual # of packets */ int negotiationError; /* cipher/parameter err */ } HandShakeInfo; @@ -58,7 +58,7 @@ typedef struct timeval Timeval; typedef struct packetInfo_st { char packetName[MAX_PACKETNAME_SZ + 1]; /* SSL packet name */ Timeval timestamp; /* when it occurred */ - unsigned char value[MAX_VALUE_SZ]; /* if fits, it's here */ + unsigned char value[MAX_VALUE_SZ]; /* if fits, it's here */ unsigned char* bufferValue; /* otherwise here (non 0) */ int valueSz; /* sz of value or buffer */ } PacketInfo; diff --git a/wolfssl/crl.h b/wolfssl/crl.h index 88e0f1098..804cd5385 100644 --- a/wolfssl/crl.h +++ b/wolfssl/crl.h @@ -1,6 +1,6 @@ /* crl.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/error-ssl.h b/wolfssl/error-ssl.h index fd82947c6..cef6ed945 100644 --- a/wolfssl/error-ssl.h +++ b/wolfssl/error-ssl.h @@ -1,6 +1,6 @@ /* error-ssl.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/internal.h b/wolfssl/internal.h index ac8507aaa..30180a46e 100755 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -1,6 +1,6 @@ /* internal.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/ocsp.h b/wolfssl/ocsp.h index 51fb7d320..65fe03885 100644 --- a/wolfssl/ocsp.h +++ b/wolfssl/ocsp.h @@ -1,6 +1,6 @@ /* ocsp.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/openssl/aes.h b/wolfssl/openssl/aes.h index e59922b8e..9aff9f38d 100644 --- a/wolfssl/openssl/aes.h +++ b/wolfssl/openssl/aes.h @@ -1,6 +1,6 @@ /* aes.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/openssl/des.h b/wolfssl/openssl/des.h index d154b72be..1636b3f72 100644 --- a/wolfssl/openssl/des.h +++ b/wolfssl/openssl/des.h @@ -1,6 +1,6 @@ /* des.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -21,7 +21,7 @@ -/* des.h defines mini des openssl compatibility layer +/* des.h defines mini des openssl compatibility layer * */ diff --git a/wolfssl/openssl/evp.h b/wolfssl/openssl/evp.h index c6b355647..963876194 100644 --- a/wolfssl/openssl/evp.h +++ b/wolfssl/openssl/evp.h @@ -1,6 +1,6 @@ /* evp.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/openssl/hmac.h b/wolfssl/openssl/hmac.h index 3cf92fe1c..f8b12090c 100644 --- a/wolfssl/openssl/hmac.h +++ b/wolfssl/openssl/hmac.h @@ -1,6 +1,6 @@ /* hmac.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -21,7 +21,7 @@ -/* hmac.h defines mini hamc openssl compatibility layer +/* hmac.h defines mini hamc openssl compatibility layer * */ diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h index a2bbe86f8..43f20552f 100644 --- a/wolfssl/openssl/ssl.h +++ b/wolfssl/openssl/ssl.h @@ -1,6 +1,6 @@ /* ssl.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/options.h.in b/wolfssl/options.h.in index 19d1fcec9..73f797011 100644 --- a/wolfssl/options.h.in +++ b/wolfssl/options.h.in @@ -1,6 +1,6 @@ /* options.h.in * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/sniffer.h b/wolfssl/sniffer.h index 9773f7987..4bd9f42d7 100644 --- a/wolfssl/sniffer.h +++ b/wolfssl/sniffer.h @@ -1,6 +1,6 @@ /* sniffer.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/sniffer_error.h b/wolfssl/sniffer_error.h index 0c04ba878..8c813b198 100644 --- a/wolfssl/sniffer_error.h +++ b/wolfssl/sniffer_error.h @@ -1,6 +1,6 @@ /* sniffer_error.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index 2de43a5be..bfd18afe5 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -1,6 +1,6 @@ /* ssl.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/version.h b/wolfssl/version.h index ee9eb47d4..075f9e4cf 100644 --- a/wolfssl/version.h +++ b/wolfssl/version.h @@ -1,6 +1,6 @@ /* wolfssl_version.h.in * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -28,8 +28,8 @@ extern "C" { #endif -#define LIBWOLFSSL_VERSION_STRING "3.12.0" -#define LIBWOLFSSL_VERSION_HEX 0x03012000 +#define LIBWOLFSSL_VERSION_STRING "3.12.2" +#define LIBWOLFSSL_VERSION_HEX 0x03012002 #ifdef __cplusplus } diff --git a/wolfssl/version.h.in b/wolfssl/version.h.in index ecd801388..69a70b153 100644 --- a/wolfssl/version.h.in +++ b/wolfssl/version.h.in @@ -1,6 +1,6 @@ /* wolfssl_version.h.in * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/aes.h b/wolfssl/wolfcrypt/aes.h index 7300e20a9..5ea101c83 100755 --- a/wolfssl/wolfcrypt/aes.h +++ b/wolfssl/wolfcrypt/aes.h @@ -1,6 +1,6 @@ /* aes.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/arc4.h b/wolfssl/wolfcrypt/arc4.h index aab0fb984..95c1e74a2 100644 --- a/wolfssl/wolfcrypt/arc4.h +++ b/wolfssl/wolfcrypt/arc4.h @@ -1,6 +1,6 @@ /* arc4.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/asn.h b/wolfssl/wolfcrypt/asn.h index 18b12b5c2..3ff5ea597 100644 --- a/wolfssl/wolfcrypt/asn.h +++ b/wolfssl/wolfcrypt/asn.h @@ -1,6 +1,6 @@ /* asn.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/asn_public.h b/wolfssl/wolfcrypt/asn_public.h index 0e428942b..dbc46595a 100644 --- a/wolfssl/wolfcrypt/asn_public.h +++ b/wolfssl/wolfcrypt/asn_public.h @@ -1,6 +1,6 @@ /* asn_public.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/blake2-impl.h b/wolfssl/wolfcrypt/blake2-impl.h index 3830c33fc..c0632d6cb 100644 --- a/wolfssl/wolfcrypt/blake2-impl.h +++ b/wolfssl/wolfcrypt/blake2-impl.h @@ -12,7 +12,7 @@ */ /* blake2-impl.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/blake2-int.h b/wolfssl/wolfcrypt/blake2-int.h index 0d62eaf52..0a01a2154 100644 --- a/wolfssl/wolfcrypt/blake2-int.h +++ b/wolfssl/wolfcrypt/blake2-int.h @@ -12,7 +12,7 @@ */ /* blake2-int.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/blake2.h b/wolfssl/wolfcrypt/blake2.h index ccad86cfb..6c942d510 100644 --- a/wolfssl/wolfcrypt/blake2.h +++ b/wolfssl/wolfcrypt/blake2.h @@ -1,6 +1,6 @@ /* blake2.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/camellia.h b/wolfssl/wolfcrypt/camellia.h index 12a306188..09dc94329 100644 --- a/wolfssl/wolfcrypt/camellia.h +++ b/wolfssl/wolfcrypt/camellia.h @@ -27,7 +27,7 @@ /* camellia.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/chacha.h b/wolfssl/wolfcrypt/chacha.h index 68427eb9f..88d317178 100644 --- a/wolfssl/wolfcrypt/chacha.h +++ b/wolfssl/wolfcrypt/chacha.h @@ -1,6 +1,6 @@ /* chacha.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/chacha20_poly1305.h b/wolfssl/wolfcrypt/chacha20_poly1305.h index 47df00426..58b732de9 100644 --- a/wolfssl/wolfcrypt/chacha20_poly1305.h +++ b/wolfssl/wolfcrypt/chacha20_poly1305.h @@ -1,6 +1,6 @@ /* chacha20_poly1305.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/cmac.h b/wolfssl/wolfcrypt/cmac.h index 9845a43ab..c457fc256 100644 --- a/wolfssl/wolfcrypt/cmac.h +++ b/wolfssl/wolfcrypt/cmac.h @@ -1,6 +1,6 @@ /* cmac.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/coding.h b/wolfssl/wolfcrypt/coding.h index 427f3a6cb..1415b05c4 100644 --- a/wolfssl/wolfcrypt/coding.h +++ b/wolfssl/wolfcrypt/coding.h @@ -1,6 +1,6 @@ /* coding.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/compress.h b/wolfssl/wolfcrypt/compress.h index 27ead357f..43bc88c85 100644 --- a/wolfssl/wolfcrypt/compress.h +++ b/wolfssl/wolfcrypt/compress.h @@ -1,6 +1,6 @@ /* compress.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/cpuid.h b/wolfssl/wolfcrypt/cpuid.h index bc50cb7c1..549eb0fbd 100644 --- a/wolfssl/wolfcrypt/cpuid.h +++ b/wolfssl/wolfcrypt/cpuid.h @@ -1,6 +1,6 @@ /* cpuid.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/curve25519.h b/wolfssl/wolfcrypt/curve25519.h index 85b036d14..4106e25db 100644 --- a/wolfssl/wolfcrypt/curve25519.h +++ b/wolfssl/wolfcrypt/curve25519.h @@ -1,6 +1,6 @@ /* curve25519.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/des3.h b/wolfssl/wolfcrypt/des3.h index bcee30861..72145bfc9 100644 --- a/wolfssl/wolfcrypt/des3.h +++ b/wolfssl/wolfcrypt/des3.h @@ -1,6 +1,6 @@ /* des3.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/dh.h b/wolfssl/wolfcrypt/dh.h index e4753e42c..d4c8db941 100644 --- a/wolfssl/wolfcrypt/dh.h +++ b/wolfssl/wolfcrypt/dh.h @@ -1,6 +1,6 @@ /* dh.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/dsa.h b/wolfssl/wolfcrypt/dsa.h index 3476a556a..1dc738df6 100644 --- a/wolfssl/wolfcrypt/dsa.h +++ b/wolfssl/wolfcrypt/dsa.h @@ -1,6 +1,6 @@ /* dsa.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/ecc.h b/wolfssl/wolfcrypt/ecc.h index 82d2f5f5d..5bae502bb 100644 --- a/wolfssl/wolfcrypt/ecc.h +++ b/wolfssl/wolfcrypt/ecc.h @@ -1,6 +1,6 @@ /* ecc.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/ed25519.h b/wolfssl/wolfcrypt/ed25519.h index 049e4a61d..7f7393511 100644 --- a/wolfssl/wolfcrypt/ed25519.h +++ b/wolfssl/wolfcrypt/ed25519.h @@ -1,6 +1,6 @@ /* ed25519.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/error-crypt.h b/wolfssl/wolfcrypt/error-crypt.h index 0b75e126b..6c0abea54 100644 --- a/wolfssl/wolfcrypt/error-crypt.h +++ b/wolfssl/wolfcrypt/error-crypt.h @@ -1,6 +1,6 @@ /* error-crypt.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/fe_operations.h b/wolfssl/wolfcrypt/fe_operations.h index 4761de40f..561d357e3 100644 --- a/wolfssl/wolfcrypt/fe_operations.h +++ b/wolfssl/wolfcrypt/fe_operations.h @@ -1,6 +1,6 @@ /* fe_operations.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/fips_test.h b/wolfssl/wolfcrypt/fips_test.h index 5b3a2c1f9..2124e1105 100644 --- a/wolfssl/wolfcrypt/fips_test.h +++ b/wolfssl/wolfcrypt/fips_test.h @@ -1,6 +1,6 @@ /* fips_test.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/ge_operations.h b/wolfssl/wolfcrypt/ge_operations.h index f3a110b33..ec534e62b 100644 --- a/wolfssl/wolfcrypt/ge_operations.h +++ b/wolfssl/wolfcrypt/ge_operations.h @@ -1,6 +1,6 @@ /* ge_operations.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/hash.h b/wolfssl/wolfcrypt/hash.h index 19f7b9a44..c591bbd5a 100644 --- a/wolfssl/wolfcrypt/hash.h +++ b/wolfssl/wolfcrypt/hash.h @@ -1,6 +1,6 @@ /* hash.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/hc128.h b/wolfssl/wolfcrypt/hc128.h index 1b2578b40..48f6d62e9 100644 --- a/wolfssl/wolfcrypt/hc128.h +++ b/wolfssl/wolfcrypt/hc128.h @@ -1,6 +1,6 @@ /* hc128.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/hmac.h b/wolfssl/wolfcrypt/hmac.h index 744f2e8e0..b37825af5 100644 --- a/wolfssl/wolfcrypt/hmac.h +++ b/wolfssl/wolfcrypt/hmac.h @@ -1,6 +1,6 @@ /* hmac.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/idea.h b/wolfssl/wolfcrypt/idea.h index b37a31b78..6776de7e1 100644 --- a/wolfssl/wolfcrypt/idea.h +++ b/wolfssl/wolfcrypt/idea.h @@ -1,6 +1,6 @@ /* idea.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/integer.h b/wolfssl/wolfcrypt/integer.h index de78b55bf..f3f741074 100644 --- a/wolfssl/wolfcrypt/integer.h +++ b/wolfssl/wolfcrypt/integer.h @@ -1,6 +1,6 @@ /* integer.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/logging.h b/wolfssl/wolfcrypt/logging.h index 4b3f4f72f..a9db18d0e 100755 --- a/wolfssl/wolfcrypt/logging.h +++ b/wolfssl/wolfcrypt/logging.h @@ -1,6 +1,6 @@ /* logging.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/md2.h b/wolfssl/wolfcrypt/md2.h index a86995e9c..ae73ac443 100644 --- a/wolfssl/wolfcrypt/md2.h +++ b/wolfssl/wolfcrypt/md2.h @@ -1,6 +1,6 @@ /* md2.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/md4.h b/wolfssl/wolfcrypt/md4.h index 7b2688ec4..63f53f285 100644 --- a/wolfssl/wolfcrypt/md4.h +++ b/wolfssl/wolfcrypt/md4.h @@ -1,6 +1,6 @@ /* md4.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/md5.h b/wolfssl/wolfcrypt/md5.h index acc19e936..45b5d3703 100644 --- a/wolfssl/wolfcrypt/md5.h +++ b/wolfssl/wolfcrypt/md5.h @@ -1,6 +1,6 @@ /* md5.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/mem_track.h b/wolfssl/wolfcrypt/mem_track.h index d038e7931..2f73573c9 100644 --- a/wolfssl/wolfcrypt/mem_track.h +++ b/wolfssl/wolfcrypt/mem_track.h @@ -1,6 +1,6 @@ /* mem_track.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/memory.h b/wolfssl/wolfcrypt/memory.h index 9ecd9cd92..736183b97 100644 --- a/wolfssl/wolfcrypt/memory.h +++ b/wolfssl/wolfcrypt/memory.h @@ -1,6 +1,6 @@ /* memory.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/misc.h b/wolfssl/wolfcrypt/misc.h index ed64159c8..3bc8cae89 100644 --- a/wolfssl/wolfcrypt/misc.h +++ b/wolfssl/wolfcrypt/misc.h @@ -1,6 +1,6 @@ /* misc.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/mpi_class.h b/wolfssl/wolfcrypt/mpi_class.h index 32b95f1f3..72745269a 100644 --- a/wolfssl/wolfcrypt/mpi_class.h +++ b/wolfssl/wolfcrypt/mpi_class.h @@ -1,6 +1,6 @@ /* mpi_class.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/mpi_superclass.h b/wolfssl/wolfcrypt/mpi_superclass.h index aa09bed63..0969054ed 100644 --- a/wolfssl/wolfcrypt/mpi_superclass.h +++ b/wolfssl/wolfcrypt/mpi_superclass.h @@ -1,6 +1,6 @@ /* mpi_superclass.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -83,9 +83,9 @@ #undef BN_FAST_MP_INVMOD_C /* To safely undefine these you have to make sure your RSA key won't exceed the Comba threshold - * which is roughly 255 digits [7140 bits for 32-bit machines, 15300 bits for 64-bit machines] + * which is roughly 255 digits [7140 bits for 32-bit machines, 15300 bits for 64-bit machines] * which means roughly speaking you can handle up to 2536-bit RSA keys with these defined without - * trouble. + * trouble. */ #undef BN_S_MP_MUL_DIGS_C #undef BN_S_MP_SQR_C diff --git a/wolfssl/wolfcrypt/pkcs12.h b/wolfssl/wolfcrypt/pkcs12.h index 934f784f5..ca0ff3d74 100644 --- a/wolfssl/wolfcrypt/pkcs12.h +++ b/wolfssl/wolfcrypt/pkcs12.h @@ -1,6 +1,6 @@ /* pkcs12.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/pkcs7.h b/wolfssl/wolfcrypt/pkcs7.h index b92c451f2..05ed997f8 100644 --- a/wolfssl/wolfcrypt/pkcs7.h +++ b/wolfssl/wolfcrypt/pkcs7.h @@ -1,6 +1,6 @@ /* pkcs7.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/poly1305.h b/wolfssl/wolfcrypt/poly1305.h index 24da1e8ec..d976ed583 100644 --- a/wolfssl/wolfcrypt/poly1305.h +++ b/wolfssl/wolfcrypt/poly1305.h @@ -1,6 +1,6 @@ /* poly1305.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/port/atmel/atmel.h b/wolfssl/wolfcrypt/port/atmel/atmel.h index 99532dbad..5a8a81392 100644 --- a/wolfssl/wolfcrypt/port/atmel/atmel.h +++ b/wolfssl/wolfcrypt/port/atmel/atmel.h @@ -1,6 +1,6 @@ /* atecc508.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. (formerly known as CyaSSL) * @@ -46,10 +46,10 @@ struct WOLFSSL_X509_STORE_CTX; typedef struct t_atcert { uint32_t signer_ca_size; uint8_t signer_ca[512]; - uint8_t signer_ca_pubkey[64]; + uint8_t signer_ca_pubkey[64]; uint32_t end_user_size; uint8_t end_user[512]; - uint8_t end_user_pubkey[64]; + uint8_t end_user_pubkey[64]; } t_atcert; extern t_atcert atcert; diff --git a/wolfssl/wolfcrypt/port/nrf51.h b/wolfssl/wolfcrypt/port/nrf51.h index ca085fad6..a8b70faba 100644 --- a/wolfssl/wolfcrypt/port/nrf51.h +++ b/wolfssl/wolfcrypt/port/nrf51.h @@ -1,6 +1,6 @@ /* nrf51.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/port/nxp/ksdk_port.h b/wolfssl/wolfcrypt/port/nxp/ksdk_port.h index 913951073..5d3150a26 100644 --- a/wolfssl/wolfcrypt/port/nxp/ksdk_port.h +++ b/wolfssl/wolfcrypt/port/nxp/ksdk_port.h @@ -1,6 +1,6 @@ /* ksdk_port.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h b/wolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h index edbf4ef75..49ea1af47 100644 --- a/wolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h +++ b/wolfssl/wolfcrypt/port/pic32/pic32mz-crypt.h @@ -1,6 +1,6 @@ /* pic32mz-crypt.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/port/ti/ti-ccm.h b/wolfssl/wolfcrypt/port/ti/ti-ccm.h index 30ab108ac..9b05a038e 100644 --- a/wolfssl/wolfcrypt/port/ti/ti-ccm.h +++ b/wolfssl/wolfcrypt/port/ti/ti-ccm.h @@ -1,6 +1,6 @@ /* port/ti/ti_ccm.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -35,7 +35,7 @@ int wolfSSL_TI_CCMInit(void) ; #ifndef SINGLE_THREADED void wolfSSL_TI_lockCCM(void) ; void wolfSSL_TI_unlockCCM(void) ; -#else +#else #define wolfSSL_TI_lockCCM() #define wolfSSL_TI_unlockCCM() #endif diff --git a/wolfssl/wolfcrypt/port/ti/ti-hash.h b/wolfssl/wolfcrypt/port/ti/ti-hash.h index 93311a4e2..081f4971b 100644 --- a/wolfssl/wolfcrypt/port/ti/ti-hash.h +++ b/wolfssl/wolfcrypt/port/ti/ti-hash.h @@ -1,6 +1,6 @@ /* port/ti/ti-hash.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/port/xilinx/xil-sha3.h b/wolfssl/wolfcrypt/port/xilinx/xil-sha3.h index 062deca01..74122560a 100755 --- a/wolfssl/wolfcrypt/port/xilinx/xil-sha3.h +++ b/wolfssl/wolfcrypt/port/xilinx/xil-sha3.h @@ -1,6 +1,6 @@ /* xil-sha3.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/pwdbased.h b/wolfssl/wolfcrypt/pwdbased.h index 8e055c466..80fe287f4 100644 --- a/wolfssl/wolfcrypt/pwdbased.h +++ b/wolfssl/wolfcrypt/pwdbased.h @@ -1,6 +1,6 @@ /* pwdbased.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/rabbit.h b/wolfssl/wolfcrypt/rabbit.h index fea0ec1b8..fbbe9868b 100644 --- a/wolfssl/wolfcrypt/rabbit.h +++ b/wolfssl/wolfcrypt/rabbit.h @@ -1,6 +1,6 @@ /* rabbit.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/random.h b/wolfssl/wolfcrypt/random.h index d286f0654..0f8e125d4 100644 --- a/wolfssl/wolfcrypt/random.h +++ b/wolfssl/wolfcrypt/random.h @@ -1,6 +1,6 @@ /* random.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/ripemd.h b/wolfssl/wolfcrypt/ripemd.h index 65897abaa..8f7003c07 100644 --- a/wolfssl/wolfcrypt/ripemd.h +++ b/wolfssl/wolfcrypt/ripemd.h @@ -1,6 +1,6 @@ /* ripemd.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/rsa.h b/wolfssl/wolfcrypt/rsa.h index 817beb568..931fc8163 100644 --- a/wolfssl/wolfcrypt/rsa.h +++ b/wolfssl/wolfcrypt/rsa.h @@ -1,6 +1,6 @@ /* rsa.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index bec6e5397..b23b838df 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -1,6 +1,6 @@ /* settings.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/sha.h b/wolfssl/wolfcrypt/sha.h index a35c0c55f..0831e056b 100644 --- a/wolfssl/wolfcrypt/sha.h +++ b/wolfssl/wolfcrypt/sha.h @@ -1,6 +1,6 @@ /* sha.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/sha256.h b/wolfssl/wolfcrypt/sha256.h index 2416d63a8..c71dca32a 100644 --- a/wolfssl/wolfcrypt/sha256.h +++ b/wolfssl/wolfcrypt/sha256.h @@ -1,6 +1,6 @@ /* sha256.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/sha3.h b/wolfssl/wolfcrypt/sha3.h index c48d76c47..b931db919 100644 --- a/wolfssl/wolfcrypt/sha3.h +++ b/wolfssl/wolfcrypt/sha3.h @@ -1,6 +1,6 @@ /* sha3.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/sha512.h b/wolfssl/wolfcrypt/sha512.h index 8e9ea8eec..f8982850a 100644 --- a/wolfssl/wolfcrypt/sha512.h +++ b/wolfssl/wolfcrypt/sha512.h @@ -1,6 +1,6 @@ /* sha512.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/signature.h b/wolfssl/wolfcrypt/signature.h index da5c061b8..453a8c9fe 100644 --- a/wolfssl/wolfcrypt/signature.h +++ b/wolfssl/wolfcrypt/signature.h @@ -1,6 +1,6 @@ /* signature.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/srp.h b/wolfssl/wolfcrypt/srp.h index 6349d31bd..0b74b7ecf 100644 --- a/wolfssl/wolfcrypt/srp.h +++ b/wolfssl/wolfcrypt/srp.h @@ -1,6 +1,6 @@ /* srp.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/tfm.h b/wolfssl/wolfcrypt/tfm.h index 4b178af4a..3364c33b2 100644 --- a/wolfssl/wolfcrypt/tfm.h +++ b/wolfssl/wolfcrypt/tfm.h @@ -1,6 +1,6 @@ /* tfm.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h index 59247206b..152335cf7 100755 --- a/wolfssl/wolfcrypt/types.h +++ b/wolfssl/wolfcrypt/types.h @@ -1,6 +1,6 @@ /* types.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/visibility.h b/wolfssl/wolfcrypt/visibility.h index d77cfde5c..78191aa49 100644 --- a/wolfssl/wolfcrypt/visibility.h +++ b/wolfssl/wolfcrypt/visibility.h @@ -1,6 +1,6 @@ /* visibility.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/wc_encrypt.h b/wolfssl/wolfcrypt/wc_encrypt.h index 4cbc9f428..9fac42927 100644 --- a/wolfssl/wolfcrypt/wc_encrypt.h +++ b/wolfssl/wolfcrypt/wc_encrypt.h @@ -1,6 +1,6 @@ /* wc_encrypt.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h index 5a4d56a23..ff7a07d19 100644 --- a/wolfssl/wolfcrypt/wc_port.h +++ b/wolfssl/wolfcrypt/wc_port.h @@ -1,6 +1,6 @@ /* wc_port.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/wolfevent.h b/wolfssl/wolfcrypt/wolfevent.h index 221c1d7d3..ed83a1b01 100644 --- a/wolfssl/wolfcrypt/wolfevent.h +++ b/wolfssl/wolfcrypt/wolfevent.h @@ -1,6 +1,6 @@ /* wolfevent.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/wolfmath.h b/wolfssl/wolfcrypt/wolfmath.h index 67e64466d..d7c9cc786 100644 --- a/wolfssl/wolfcrypt/wolfmath.h +++ b/wolfssl/wolfcrypt/wolfmath.h @@ -1,6 +1,6 @@ /* wolfmath.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfio.h b/wolfssl/wolfio.h index 1c4850e44..9055a51c0 100644 --- a/wolfssl/wolfio.h +++ b/wolfssl/wolfio.h @@ -1,6 +1,6 @@ /* io.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. *