From 3c27deb9d06cde97baa696c9793cb4dcc7569d6b Mon Sep 17 00:00:00 2001
From: JacobBarthelmeh <jacob@wolfssl.com>
Date: Mon, 21 Jul 2014 13:50:22 -0600
Subject: [PATCH] merge

---
 .gitignore       |  3 +++
 Makefile.am      |  2 +-
 README           | 24 +++++++++++++++++++++++-
 configure.ac     |  4 ++--
 cyassl/version.h |  4 ++--
 src/internal.c   |  3 +--
 6 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index adf7926eb..ec648f2a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,9 @@ certecc.der
 certecc.pem
 othercert.der
 othercert.pem
+ntru-cert.der
+ntru-cert.pem
+ntru-key.raw
 key.der
 key.pem
 certreq.der
diff --git a/Makefile.am b/Makefile.am
index c2d916e49..5918a4dc5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -96,7 +96,7 @@ TESTS_ENVIRONMENT=./valgrind-error.sh
 endif
 
 TEST_EXTENSIONS=.test
-TESTS += $(check_PROGRAMS) ./client-test.sh
+TESTS += $(check_PROGRAMS)
 test: check
 tests/unit.log: testsuite/testsuite.log
 
diff --git a/README b/README
index cb12a6cda..e2da67459 100644
--- a/README
+++ b/README
@@ -35,7 +35,29 @@ before calling SSL_new();  Though it's not recommended.
 *** end Notes ***
 
 
-CyaSSL Release 3.0.2 (05/30/2014)
+CyaSSL Release 3.1.0 (07/14/2014)
+
+Release 3.1.0 CyaSSL has bug fixes and new features including:
+
+- Fix for older versions of icc without 128-bit type
+- Intel ASM syntax for AES-NI
+- Updated NTRU support, keygen benchmark
+- FIPS check for minimum required HMAC key length
+- Small stack (--enable-smallstack) improvements for PKCS#7, ASN
+- TLS extension support for DTLS
+- Default I/O callbacks external to user
+- Updated example client with bad clock test
+- Ability to set optional ECC context info
+- Ability to enable/disable DH separate from opensslextra
+- Additional test key/cert buffers for CA and server
+- Updated example certificates
+
+The CyaSSL manual is available at:
+http://www.yassl.com/documentation/CyaSSL-Manual.pdf.  For build instructions
+and comments about the new features please check the manual.
+
+
+************ CyaSSL Release 3.0.2 (05/30/2014)
 
 Release 3.0.2 CyaSSL has bug fixes and new features including:
 
diff --git a/configure.ac b/configure.ac
index e9faab304..13f1fdac5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 #
 #
 
-AC_INIT([cyassl],[3.0.3],[https://github.com/cyassl/cyassl/issues],[cyassl],[http://www.wolfssl.com])
+AC_INIT([cyassl],[3.1.0],[https://github.com/cyassl/cyassl/issues],[cyassl],[http://www.wolfssl.com])
 
 AC_CONFIG_AUX_DIR([build-aux])
 
@@ -31,7 +31,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
-CYASSL_LIBRARY_VERSION=5:5:0
+CYASSL_LIBRARY_VERSION=5:6:0
 #                      | | |
 #               +------+ | +---+
 #               |        |     |
diff --git a/cyassl/version.h b/cyassl/version.h
index f520844e6..a2d1dea9c 100644
--- a/cyassl/version.h
+++ b/cyassl/version.h
@@ -26,8 +26,8 @@
 extern "C" {
 #endif
 
-#define LIBCYASSL_VERSION_STRING "3.0.3"
-#define LIBCYASSL_VERSION_HEX 0x03000003
+#define LIBCYASSL_VERSION_STRING "3.1.0"
+#define LIBCYASSL_VERSION_HEX 0x03001000
 
 #ifdef __cplusplus
 }
diff --git a/src/internal.c b/src/internal.c
index c75c3cace..34c1e41d7 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -57,7 +57,6 @@
     #define FALSE 0
 #endif
 
-
 #if defined(CYASSL_CALLBACKS) && !defined(LARGE_STATIC_BUFFERS)
     #error \
 CYASSL_CALLBACKS needs LARGE_STATIC_BUFFERS, please add LARGE_STATIC_BUFFERS
@@ -6569,7 +6568,7 @@ static int BuildMessage(CYASSL* ssl, byte* output, int outSz,
             ivSz = AEAD_EXP_IV_SZ;
 
         sz += (ivSz + ssl->specs.aead_mac_size - digestSz);
-        XMEMCPY(iv, ssl->keys.aead_exp_IV, AEAD_EXP_IV_SZ); 
+        XMEMCPY(iv, ssl->keys.aead_exp_IV, AEAD_EXP_IV_SZ);
     }
 #endif
     if (sz > (word32)outSz) {