merge in sni

2013-05-21 14:37:50 -07:00
parent b347df8d9a
commit d2003bb8b7
15 changed files with 1012 additions and 127 deletions
--- a/ctaocrypt/src/memory.c
+++ b/ctaocrypt/src/memory.c
@@ -25,6 +25,8 @@

 #include <cyassl/ctaocrypt/settings.h>

+/* submitted by eof */
+
 #ifdef USE_CYASSL_MEMORY

 #include <cyassl/ctaocrypt/memory.h>
--- a/ctaocrypt/src/tfm.c
+++ b/ctaocrypt/src/tfm.c
@@ -26,7 +26,7 @@
 */

 /**
- *  Edited by Moisés Guimarães (moises.guimaraes@phoebus.com.br)
+ *  Edited by Moisés Guimarães (moisesguimaraesm@gmail.com)
 *  to fit CyaSSL's needs.
 */