diff options
| author | David Planella <david.planella@gmail.com> | 2009-01-29 00:22:52 +0100 |
|---|---|---|
| committer | David Planella <david.planella@gmail.com> | 2009-01-29 00:22:52 +0100 |
| commit | 518b3843c0117f24b1b277a724169fb616604e4d (patch) | |
| tree | 01ab5cbe392ff3a8e851dae1be4eb3a8cf8ed439 /bin/export.py | |
| parent | 42fcf522d7818e9e1ee922d1a68824b0f6dcc83d (diff) | |
| parent | c0da6af58657b1fe5730d3dea0e78bc17dac490a (diff) | |
| download | mailman2-518b3843c0117f24b1b277a724169fb616604e4d.tar.gz mailman2-518b3843c0117f24b1b277a724169fb616604e4d.tar.xz mailman2-518b3843c0117f24b1b277a724169fb616604e4d.zip | |
Merged from upstream
Diffstat (limited to 'bin/export.py')
| -rw-r--r-- | bin/export.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bin/export.py b/bin/export.py index c8d890eb..122ce8de 100644 --- a/bin/export.py +++ b/bin/export.py @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 2006-2007 by the Free Software Foundation, Inc. +# Copyright (C) 2006-2008 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -21,7 +21,6 @@ import os import sys -import sha import base64 import codecs import datetime @@ -289,13 +288,13 @@ def plaintext_password(password): def sha_password(password): - h = sha.new(password) + h = Utils.sha_new(password) return '{SHA}' + base64.b64encode(h.digest()) def ssha_password(password): salt = os.urandom(SALT_LENGTH) - h = sha.new(password) + h = Utils.sha_new(password) h.update(salt) return '{SSHA}' + base64.b64encode(h.digest() + salt) |