update to misc.c integer.c and tfm.c

src/include.am

@@ -180,9 +180,12 @@ endif
 endif
 
 if BUILD_FASTMATH
+if BUILD_FIPS
 src_libwolfssl_la_SOURCES += ctaocrypt/src/tfm.c
+else
 src_libwolfssl_la_SOURCES += wolfcrypt/src/tfm.c
 endif
+endif
 
 if BUILD_SLOWMATH
 if BUILD_FIPS

wolfcrypt/src/misc.c

@@ -2,14 +2,14 @@
  *
  * Copyright (C) 2006-2014 wolfSSL Inc.
  *
- * This file is part of CyaSSL.
+ * This file is part of wolfSSL. (formerly known as CyaSSL)
  *
- * CyaSSL is free software; you can redistribute it and/or modify
+ * wolfSSL is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * CyaSSL is distributed in the hope that it will be useful,
+ * wolfSSL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -23,9 +23,9 @@
     #include <config.h>
 #endif
 
-#include <cyassl/ctaocrypt/settings.h>
+#include <wolfssl/wolfcrypt/settings.h>
 
-#include <cyassl/ctaocrypt/misc.h>
+#include <wolfssl/wolfcrypt/misc.h>
 
 /* inlining these functions is a huge speed increase and a small size decrease, 
    because the functions are smaller than function call setup/cleanup, e.g.,

wolfssl/wolfcrypt/integer.h

@@ -25,8 +25,8 @@
  */
 
 
-#ifndef CTAO_CRYPT_INTEGER_H
+#ifndef WOLF_CRYPT_INTEGER_H
-#define CTAO_CRYPT_INTEGER_H
+#define WOLF_CRYPT_INTEGER_H
 
 /* may optionally use fast math instead, not yet supported on all platforms and
    may not be faster on all
@@ -320,5 +320,5 @@ int mp_mod_d(mp_int* a, mp_digit b, mp_digit* c);
 
 #endif /* USE_FAST_MATH */
 
-#endif  /* CTAO_CRYPT_INTEGER_H */
+#endif  /* WOLF_CRYPT_INTEGER_H */