*Merge.

--HG--
branch : trunk

9 files changed, 9 insertions, 0 deletions

diff --git a/src/shared/Auth/AuthCrypt.cpp b/src/shared/Auth/AuthCrypt.cpp
index d45c56817ba..7cbb7f13648 100644
--- a/src/shared/Auth/AuthCrypt.cpp
+++ b/src/shared/Auth/AuthCrypt.cpp
@@ -81,3 +81,4 @@ void AuthCrypt::GenerateKey(uint8 *key, BigNumber *bn)
     hash.Finalize();
     memcpy(key, hash.GetDigest(), SHA_DIGEST_LENGTH);
 }
+
diff --git a/src/shared/Auth/AuthCrypt.h b/src/shared/Auth/AuthCrypt.h
index b007e8c3d0e..020f8bcdc96 100644
--- a/src/shared/Auth/AuthCrypt.h
+++ b/src/shared/Auth/AuthCrypt.h
@@ -52,3 +52,4 @@ class AuthCrypt
         bool _initialized;
 };
 #endif
+
diff --git a/src/shared/Auth/BigNumber.cpp b/src/shared/Auth/BigNumber.cpp
index 2baba88e9e0..da31da3a522 100644
--- a/src/shared/Auth/BigNumber.cpp
+++ b/src/shared/Auth/BigNumber.cpp
@@ -207,3 +207,4 @@ const char *BigNumber::AsDecStr()
 {
     return BN_bn2dec(_bn);
 }
+
diff --git a/src/shared/Auth/BigNumber.h b/src/shared/Auth/BigNumber.h
index 37979bdd76f..df25e4f934d 100644
--- a/src/shared/Auth/BigNumber.h
+++ b/src/shared/Auth/BigNumber.h
@@ -94,3 +94,4 @@ class BigNumber
         uint8 *_array;
 };
 #endif
+
diff --git a/src/shared/Auth/Hmac.cpp b/src/shared/Auth/Hmac.cpp
index 91c065d3640..615edd26ca5 100644
--- a/src/shared/Auth/Hmac.cpp
+++ b/src/shared/Auth/Hmac.cpp
@@ -56,3 +56,4 @@ void HmacHash::Finalize()
     HMAC_Final(&m_ctx, m_digest, &length);
     ASSERT(length == SHA_DIGEST_LENGTH)
 }
+
diff --git a/src/shared/Auth/Hmac.h b/src/shared/Auth/Hmac.h
index 1c19ec2238d..5b7c4040f13 100644
--- a/src/shared/Auth/Hmac.h
+++ b/src/shared/Auth/Hmac.h
@@ -46,3 +46,4 @@ class HmacHash
         uint8 m_digest[SHA_DIGEST_LENGTH];
 };
 #endif
+
diff --git a/src/shared/Auth/Sha1.cpp b/src/shared/Auth/Sha1.cpp
index 73fcf90bfa8..90334543b82 100644
--- a/src/shared/Auth/Sha1.cpp
+++ b/src/shared/Auth/Sha1.cpp
@@ -65,3 +65,4 @@ void Sha1Hash::Finalize(void)
 {
     SHA1_Final(mDigest, &mC);
 }
+
diff --git a/src/shared/Auth/Sha1.h b/src/shared/Auth/Sha1.h
index d748dc6d747..6794d3bd103 100644
--- a/src/shared/Auth/Sha1.h
+++ b/src/shared/Auth/Sha1.h
@@ -51,3 +51,4 @@ class Sha1Hash
         uint8 mDigest[SHA_DIGEST_LENGTH];
 };
 #endif
+
diff --git a/src/shared/Auth/md5.h b/src/shared/Auth/md5.h
index fa2937e13e4..0463051b6a6 100644
--- a/src/shared/Auth/md5.h
+++ b/src/shared/Auth/md5.h
@@ -89,3 +89,4 @@ extern "C"
 }                                                           /* end extern "C" */
 #endif
 #endif                                                      /* md5_INCLUDED */
+