From 541deaa0c04abd274bdb5dd30990cc2993e5853e Mon Sep 17 00:00:00 2001
From: toddouska <todd@yassl.com>
Date: Thu, 20 Dec 2012 13:25:32 -0800
Subject: [PATCH] release 2.4.6

---
 README           |  4 ++--
 configure.ac     | 22 +++-------------------
 cyassl/version.h |  4 ++--
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/README b/README
index 4771e375a..1ea67ad0c 100644
--- a/README
+++ b/README
@@ -35,9 +35,9 @@ before calling SSL_new();  Though it's not recommended.
 *** end Notes ***
 
 
-CyaSSL Release 2.4.4 (12/12/2012)
+CyaSSL Release 2.4.6 (12/20/2012)
 
-Release 2.4.4 CyaSSL has bug fixes and a few new features including:
+Release 2.4.6 CyaSSL has bug fixes and a few new features including:
 - ECC into main version
 - Lean PSK build (reduced code size, RAM usage, and stack usage)
 - FreeBSD CRL monitor support
diff --git a/configure.ac b/configure.ac
index 4f5ba1166..a57a19773 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 #
 #
 
-AC_INIT([cyassl],[2.4.4],[http://www.yassl.com])
+AC_INIT([cyassl],[2.4.6],[http://www.yassl.com])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
@@ -26,7 +26,7 @@ AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS.
 
 
 #shared library versioning
-CYASSL_LIBRARY_VERSION=3:3:0
+CYASSL_LIBRARY_VERSION=4:0:0
 #                      | | |
 #               +------+ | +---+
 #               |        |     |
@@ -105,22 +105,6 @@ AS_IF([test "$ax_enable_debug" = "yes"],
       [AM_CFLAGS="$AM_CFLAGS -DNDEBUG"])
 
 
-# SMALL BUILD
-AC_ARG_ENABLE([small],
-    [  --enable-small          Enable smallest build (default: disabled)],
-    [ ENABLED_SMALL=$enableval ],
-    [ ENABLED_SMALL=no ]
-    )
-if test "$ENABLED_SMALL" = "yes"
-then
-  # make small no tls build with smallest cipher
-  # if you only want server or client you can define NO_CYASSL_SERVER or
-  # NO_CYASSL_CLIENT but then some of the examples and testsuite won't build
-  # note that TLS needs HMAC
-  AM_CFLAGS="-DNO_TLS -DNO_HMAC -DNO_AES -DNO_DES3 -DNO_SHA256 -DNO_ERROR_STRINGS -DNO_RABBIT -DNO_PSK -DNO_DSA -DNO_DH -DNO_PWDBASED $AM_CFLAGS" 
-fi
-
-
 # SINGLE THREADED
 AC_ARG_ENABLE([singleThreaded],
     [  --enable-singleThreaded Enable CyaSSL single threaded (default: disabled)],
@@ -690,6 +674,7 @@ AC_ARG_ENABLE([examples],
     )
 
 AS_IF([test "x$ENABLED_SINGLETHREADED" = "xyes"], [ENABLED_EXAMPLES="no"])
+AS_IF([test "x$ENABLED_NOFILESYSTEM" = "xyes"], [ENABLED_EXAMPLES="no"])
 AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$ENABLED_EXAMPLES" = "xyes"])
 
 # LIBZ
@@ -804,7 +789,6 @@ echo "   * make -j:                   $enable_jobserver"
 echo "   * VCS checkout:              $ac_cv_vcs_checkout"
 echo 
 echo "   Features "
-echo "   * Enable smallest build:     $ENABLED_SMALL"
 echo "   * Single threaded:           $ENABLED_SINGLETHREADED"
 echo "   * DTLS:                      $ENABLED_DTLS"
 echo "   * Enable extra OpenSSL API:  $ENABLED_OPENSSLEXTRA"
diff --git a/cyassl/version.h b/cyassl/version.h
index 58f9f44f8..f286cd013 100644
--- a/cyassl/version.h
+++ b/cyassl/version.h
@@ -26,8 +26,8 @@
 extern "C" {
 #endif
 
-#define LIBCYASSL_VERSION_STRING "2.4.4"
-#define LIBCYASSL_VERSION_HEX 0x02004004
+#define LIBCYASSL_VERSION_STRING "2.4.6"
+#define LIBCYASSL_VERSION_HEX 0x02004006
 
 #ifdef __cplusplus
 }