| 1 |
On 10/01/2011 02:41 AM, Brian Harring wrote: |
| 2 |
> On Sat, Oct 01, 2011 at 07:40:52AM +0000, Robin H. Johnson wrote: |
| 3 |
>> From: "Robin H. Johnson" <robbat2@g.o> |
| 4 |
>> |
| 5 |
>> Provide public-domain implementation of the Whirlpool hash algorithm to |
| 6 |
>> be used as new Manifest2 hash. |
| 7 |
>> |
| 8 |
>> Signed-off-by: Robin H. Johnson <robbat2@g.o> |
| 9 |
>> --- |
| 10 |
>> pym/portage/checksum.py | 8 ++++++-- |
| 11 |
>> 1 files changed, 6 insertions(+), 2 deletions(-) |
| 12 |
>> |
| 13 |
>> diff --git a/pym/portage/checksum.py b/pym/portage/checksum.py |
| 14 |
>> index e5455fa..3593686 100644 |
| 15 |
>> --- a/pym/portage/checksum.py |
| 16 |
>> +++ b/pym/portage/checksum.py |
| 17 |
>> @@ -71,6 +71,10 @@ except ImportError: |
| 18 |
>> |
| 19 |
>> sha1hash = _generate_hash_function("SHA1", _new_sha1, origin="internal") |
| 20 |
>> |
| 21 |
>> +# Bundled WHIRLPOOL implementation |
| 22 |
>> +from portage.util.whirlpool import new as _new_whirlpool |
| 23 |
>> +whirlpoolhash = _generate_hash_function("WHIRLPOOL", _new_whirlpool, origin="bundled") |
| 24 |
>> + |
| 25 |
> |
| 26 |
> Likely should shift this to a trailing check if no whirlpool |
| 27 |
> implementation was found; via this, we can avoid the import unless |
| 28 |
> it's needed. |
| 29 |
> ~brian |
| 30 |
|
| 31 |
Thanks, that's done now: |
| 32 |
|
| 33 |
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=06ad8911b5790a2ed963fe1b981751ab0a2be8d5 |
| 34 |
|
| 35 |
-- |
| 36 |
Thanks, |
| 37 |
Zac |
Archives