aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-02-05 23:44:00 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-02-05 23:44:00 +0000
commit5a52fa512f941925b96dbda221dd001e933b72a2 (patch)
tree5fb2c91fadf6fbcbd149037d2c99a560126bfe80
parentdeb7c2929403a75839ae6913ef5ef4f3d0df8e96 (diff)
downloadpaludis-5a52fa512f941925b96dbda221dd001e933b72a2.tar.gz
paludis-5a52fa512f941925b96dbda221dd001e933b72a2.tar.xz
Tweak more.
-rw-r--r--paludis/util/sha1.cc26
-rw-r--r--paludis/util/sha1.hh3
2 files changed, 13 insertions, 16 deletions
diff --git a/paludis/util/sha1.cc b/paludis/util/sha1.cc
index b36be17..46c5a8e 100644
--- a/paludis/util/sha1.cc
+++ b/paludis/util/sha1.cc
@@ -99,20 +99,20 @@ namespace
{
return 0xCA62C1D6U;
}
-}
-template <int t_>
-inline void
-SHA1::process_chunk(uint32_t * w, uint32_t & a, uint32_t & b, uint32_t & c, uint32_t & d, uint32_t & e)
-{
- for (int t = t_; t < t_ + 20; ++t)
- {
- uint32_t temp = s<5>(a) + f<t_>(b, c, d) + e + w[t] + k<t_>();
- e = d;
- d = c;
- c = s<30>(b);
- b = a;
- a = temp;
+ template <int t_>
+ inline void
+ process_chunk(uint32_t * w, uint32_t & a, uint32_t & b, uint32_t & c, uint32_t & d, uint32_t & e)
+ {
+ for (int t = t_; t < t_ + 20; ++t)
+ {
+ uint32_t temp = s<5>(a) + f<t_>(b, c, d) + e + w[t] + k<t_>();
+ e = d;
+ d = c;
+ c = s<30>(b);
+ b = a;
+ a = temp;
+ }
}
}
diff --git a/paludis/util/sha1.hh b/paludis/util/sha1.hh
index 9c384f6..f1fc702 100644
--- a/paludis/util/sha1.hh
+++ b/paludis/util/sha1.hh
@@ -49,9 +49,6 @@ namespace paludis
uint32_t h0, h1, h2, h3, h4;
void PALUDIS_HIDDEN process_block(uint32_t *);
- template <int>
- inline void PALUDIS_HIDDEN process_chunk(
- uint32_t *, uint32_t &, uint32_t &, uint32_t &, uint32_t &, uint32_t &);
public:
/**