Skip to content

Commit

Permalink
Release v3.12.2 (lib 14.0.0). Updated copywright.
Browse files Browse the repository at this point in the history
  • Loading branch information
dgarske committed Oct 22, 2017
1 parent 39749ed commit 911b6f9
Show file tree
Hide file tree
Showing 336 changed files with 923 additions and 818 deletions.
2 changes: 1 addition & 1 deletion 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.
*
Expand Down
2 changes: 1 addition & 1 deletion 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.
*
Expand Down
2 changes: 1 addition & 1 deletion 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.
*
Expand Down
4 changes: 2 additions & 2 deletions 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.
*
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion 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.
*
Expand Down
2 changes: 1 addition & 1 deletion 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.
*
Expand Down
2 changes: 1 addition & 1 deletion 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.
*
Expand Down
2 changes: 1 addition & 1 deletion 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.
*
Expand Down
66 changes: 33 additions & 33 deletions 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.
*
Expand All @@ -19,25 +19,25 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
*/


#ifdef HAVE_CONFIG_H
#include <config.h>
#endif


/*-----------------------------------------------------------------------------
* initialize RTC
* initialize RTC
*----------------------------------------------------------------------------*/
#include <stdio.h>
#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);
Expand All @@ -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()
Expand All @@ -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;
}


Expand All @@ -88,9 +88,9 @@ void init_time(void) {

#include <time.h>

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);
Expand All @@ -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) ;
}

Expand All @@ -124,42 +124,42 @@ typedef struct func_args {

#include <stdio.h>

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") ;
}


Expand Down
2 changes: 1 addition & 1 deletion 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.
*
Expand Down
12 changes: 6 additions & 6 deletions 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.
*
Expand Down Expand Up @@ -72,7 +72,7 @@
// <e>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
// </e>
Expand Down Expand Up @@ -120,10 +120,10 @@
#define WOLFSSL_SHA384
#endif
// </e>
// <e>SHA-512
// <e>SHA-512
#define MDK_CONF_SHA512 0
#if MDK_CONF_SHA512 == 1
#define WOLFSSL_SHA512
#define WOLFSSL_SHA512
#endif
// </e>
// <e>RIPEMD
Expand Down Expand Up @@ -151,7 +151,7 @@
#endif
// </e>

// <e>AEAD
// <e>AEAD
#define MDK_CONF_AEAD 0
#if MDK_CONF_AEAD == 1
#define HAVE_AEAD
Expand All @@ -178,7 +178,7 @@
#endif
// </e>
// <e>DSA
#define MDK_CONF_DSA 1
#define MDK_CONF_DSA 1
#if MDK_CONF_DSA == 0
#define NO_DSA
#endif
Expand Down
14 changes: 7 additions & 7 deletions 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.
*
Expand Down Expand Up @@ -70,7 +70,7 @@
// <e>Crypt/Cipher Benchmark
#define MDK_CONF_CTaoCryptBenchmark 1
#if MDK_CONF_CTaoCryptBenchmark == 0
#define NO_CRYPT_BENCHMARK
#define NO_CRYPT_BENCHMARK
#endif
// </e>
// </h>
Expand All @@ -97,7 +97,7 @@
// <h>SSL (Included by default)
// </h>

// <e>TLS
// <e>TLS
#define MDK_CONF_TLS 1
#if MDK_CONF_TLS == 0
#define NO_TLS
Expand Down Expand Up @@ -157,10 +157,10 @@
#define WOLFSSL_SHA384
#endif
// </e>
// <e>SHA-512
// <e>SHA-512
#define MDK_CONF_SHA512 0
#if MDK_CONF_SHA512 == 1
#define WOLFSSL_SHA512
#define WOLFSSL_SHA512
#endif
// </e>
// <e>RIPEMD
Expand Down Expand Up @@ -188,7 +188,7 @@
#endif
// </e>

// <e>AEAD
// <e>AEAD
#define MDK_CONF_AEAD 0
#if MDK_CONF_AEAD == 1
#define HAVE_AEAD
Expand All @@ -215,7 +215,7 @@
#endif
// </e>
// <e>DSA
#define MDK_CONF_DSA 1
#define MDK_CONF_DSA 1
#if MDK_CONF_DSA == 0
#define NO_DSA
#endif
Expand Down

0 comments on commit 911b6f9

Please sign in to comment.