Takashi Kojo 3e41d8cecb Merge branch 'PIC32MZ-HWCrypt' ...

Conflicts:
	configure.ac
	ctaocrypt/benchmark/benchmark.c
	ctaocrypt/src/asn.c
	ctaocrypt/src/coding.c
	ctaocrypt/src/des3.c
	ctaocrypt/src/md5.c
	ctaocrypt/src/random.c
	ctaocrypt/src/sha.c
	ctaocrypt/src/sha256.c
	cyassl/ctaocrypt/aes.h
	cyassl/ctaocrypt/settings.h
	cyassl/ssl.h
	cyassl/version.h
	examples/server/server.c
	m4/ax_debug.m4
	m4/ax_tls.m4
	mplabx/benchmark_main.c
	mplabx/ctaocrypt_test.X/nbproject/configurations.xml
	mplabx/test_main.c
	src/io.c
	src/ocsp.c
	src/ssl.c
	src/tls.c
	testsuite/testsuite.c

2014-03-11 10:11:36 +09:00

..

ctaocrypt

Merge branch 'PIC32MZ-HWCrypt'

2014-03-11 10:11:36 +09:00

openssl

improvements to CCM, ssn6

2013-03-22 11:30:12 -07:00

callbacks.h

brought CYASSL_CALLBACK code up to current standard

2013-04-08 15:34:54 -07:00

certs_test.h

pull in Kojo MDK-ARM projects, changes

2013-05-16 09:47:27 -07:00

crl.h

fix general NO_SHA NO_ASN NO_CERTS NO_SESSION_CACHE builds/examples

2013-03-11 16:07:46 -07:00

error.h

move mutex to port layer at crypto level

2013-09-06 16:38:27 -07:00

include.am

Catching up 2.9.0

2014-03-04 22:09:38 +09:00

internal.h

Merge https://github.com/cyassl/cyassl

2014-03-11 09:55:57 +09:00

ocsp.h

Catching up 2.9.0

2014-03-04 22:09:38 +09:00

options.h.in

make clear where options.h came from

2013-04-12 16:50:16 -07:00

sniffer_error.h

change copyright name with name change

2013-02-05 12:44:17 -08:00

sniffer_error.rc

if sniffer sees ACK for missing packet(s) set to error, can't recover

2012-10-24 13:33:11 -07:00

sniffer.h

change copyright name with name change

2013-02-05 12:44:17 -08:00

ssl.h

Merge branch 'PIC32MZ-HWCrypt'

2014-03-11 10:11:36 +09:00

test.h

Merge https://github.com/cyassl/cyassl

2014-03-11 09:55:57 +09:00

version.h

Catching up 2.9.0

2014-03-04 22:09:38 +09:00

version.h.in

change copyright name with name change

2013-02-05 12:44:17 -08:00