From de3f77164fc60da8cbf1cc2dafc3087214ae5992 Mon Sep 17 00:00:00 2001 From: Todd A Ouska Date: Thu, 2 Jun 2011 14:47:47 -0700 Subject: [PATCH] rename misc.c ctc_misc.c --- ctaocrypt/src/aes.c | 2 +- ctaocrypt/src/{misc.c => ctc_misc.c} | 2 +- ctaocrypt/src/des3.c | 2 +- ctaocrypt/src/hc128.c | 2 +- ctaocrypt/src/md4.c | 2 +- ctaocrypt/src/md5.c | 2 +- ctaocrypt/src/pwdbased.c | 2 +- ctaocrypt/src/rabbit.c | 6 +++++- ctaocrypt/src/ripemd.c | 2 +- ctaocrypt/src/sha.c | 2 +- ctaocrypt/src/sha256.c | 2 +- ctaocrypt/src/sha512.c | 2 +- src/include.am | 2 +- 13 files changed, 17 insertions(+), 13 deletions(-) rename ctaocrypt/src/{misc.c => ctc_misc.c} (99%) diff --git a/ctaocrypt/src/aes.c b/ctaocrypt/src/aes.c index fe8c8a3ba..ea282ec0a 100644 --- a/ctaocrypt/src/aes.c +++ b/ctaocrypt/src/aes.c @@ -27,7 +27,7 @@ #ifdef NO_INLINE #include "ctc_misc.h" #else - #include "misc.c" + #include "ctc_misc.c" #endif diff --git a/ctaocrypt/src/misc.c b/ctaocrypt/src/ctc_misc.c similarity index 99% rename from ctaocrypt/src/misc.c rename to ctaocrypt/src/ctc_misc.c index 8552d2a33..f726143d5 100644 --- a/ctaocrypt/src/misc.c +++ b/ctaocrypt/src/ctc_misc.c @@ -1,4 +1,4 @@ -/* misc.c +/* ctc_misc.c * * Copyright (C) 2006-2011 Sawtooth Consulting Ltd. * diff --git a/ctaocrypt/src/des3.c b/ctaocrypt/src/des3.c index fb6f62a9f..a7ef3c787 100644 --- a/ctaocrypt/src/des3.c +++ b/ctaocrypt/src/des3.c @@ -26,7 +26,7 @@ #ifdef NO_INLINE #include "ctc_misc.h" #else - #include "misc.c" + #include "ctc_misc.c" #endif diff --git a/ctaocrypt/src/hc128.c b/ctaocrypt/src/hc128.c index 6cff68f18..1191cf894 100644 --- a/ctaocrypt/src/hc128.c +++ b/ctaocrypt/src/hc128.c @@ -23,7 +23,7 @@ #ifndef NO_HC128 #include "ctc_hc128.h" -#include "misc.c" +#include "ctc_misc.c" #ifdef BIG_ENDIAN_ORDER diff --git a/ctaocrypt/src/md4.c b/ctaocrypt/src/md4.c index b772c3d96..0b25a40ca 100644 --- a/ctaocrypt/src/md4.c +++ b/ctaocrypt/src/md4.c @@ -26,7 +26,7 @@ #ifdef NO_INLINE #include "ctc_misc.h" #else - #include "misc.c" + #include "ctc_misc.c" #endif diff --git a/ctaocrypt/src/md5.c b/ctaocrypt/src/md5.c index 033c83096..88b397c5d 100644 --- a/ctaocrypt/src/md5.c +++ b/ctaocrypt/src/md5.c @@ -24,7 +24,7 @@ #ifdef NO_INLINE #include "ctc_misc.h" #else - #include "misc.c" + #include "ctc_misc.c" #endif diff --git a/ctaocrypt/src/pwdbased.c b/ctaocrypt/src/pwdbased.c index bdea662d5..8b2ba9da0 100644 --- a/ctaocrypt/src/pwdbased.c +++ b/ctaocrypt/src/pwdbased.c @@ -32,7 +32,7 @@ #ifdef NO_INLINE #include "ctc_misc.h" #else - #include "misc.c" + #include "ctc_misc.c" #endif diff --git a/ctaocrypt/src/rabbit.c b/ctaocrypt/src/rabbit.c index 94173a98c..2d85136d3 100644 --- a/ctaocrypt/src/rabbit.c +++ b/ctaocrypt/src/rabbit.c @@ -23,7 +23,11 @@ #ifndef NO_RABBIT #include "ctc_rabbit.h" -#include "misc.c" +#ifdef NO_INLINE + #include "ctc_misc.h" +#else + #include "ctc_misc.c" +#endif #ifdef BIG_ENDIAN_ORDER diff --git a/ctaocrypt/src/ripemd.c b/ctaocrypt/src/ripemd.c index 1397f11f9..2f7380501 100644 --- a/ctaocrypt/src/ripemd.c +++ b/ctaocrypt/src/ripemd.c @@ -26,7 +26,7 @@ #ifdef NO_INLINE #include "ctc_misc.h" #else - #include "misc.c" + #include "ctc_misc.c" #endif diff --git a/ctaocrypt/src/sha.c b/ctaocrypt/src/sha.c index 6d817d37a..9f70652db 100644 --- a/ctaocrypt/src/sha.c +++ b/ctaocrypt/src/sha.c @@ -24,7 +24,7 @@ #ifdef NO_INLINE #include "ctc_misc.h" #else - #include "misc.c" + #include "ctc_misc.c" #endif diff --git a/ctaocrypt/src/sha256.c b/ctaocrypt/src/sha256.c index 36d5ffddb..dfe6a28e1 100644 --- a/ctaocrypt/src/sha256.c +++ b/ctaocrypt/src/sha256.c @@ -29,7 +29,7 @@ #ifdef NO_INLINE #include "ctc_misc.h" #else - #include "misc.c" + #include "ctc_misc.c" #endif diff --git a/ctaocrypt/src/sha512.c b/ctaocrypt/src/sha512.c index d3191f9bc..5986fc1ff 100644 --- a/ctaocrypt/src/sha512.c +++ b/ctaocrypt/src/sha512.c @@ -26,7 +26,7 @@ #ifdef NO_INLINE #include "ctc_misc.h" #else - #include "misc.c" + #include "ctc_misc.c" #endif diff --git a/src/include.am b/src/include.am index d576244e1..4cc4782a0 100644 --- a/src/include.am +++ b/src/include.am @@ -19,7 +19,7 @@ src_libcyassl_la_SOURCES = \ src_libcyassl_la_LDFLAGS = -no-undefined -version-info ${CYASSL_LIBRARY_VERSION} src_libcyassl_la_CFLAGS = -DBUILDING_CYASSL EXTRA_DIST += include/*.h include/openssl/*.h include/*.rc \ - ctaocrypt/include/*.h ctaocrypt/src/misc.c \ + ctaocrypt/include/*.h ctaocrypt/src/ctc_misc.c \ ctaocrypt/src/ctc_asm.c \ ctaocrypt/src/*.i if BUILD_AESNI