Skip to content

Z
Zope
Commit 40430ab5 authored by 's avatar
Browse files
Options

Fixed salt generation for crypt() generation.

parent a7aac204
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
zpasswd.py
View file @ 40430ab5
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
############################################################################## ##############################################################################
"""Zope password change system""" """Zope password change system"""
__version__='$Revision: 1.7 $ '[11:-2] __version__='$Revision: 1.8 $ '[11:-2]
import sys, string, sha, binascii, whrandom, getopt, getpass, os import sys, string, sha, binascii, whrandom, getopt, getpass, os
...@@ -99,7 +99,7 @@ def generate_salt(): ...@@ -99,7 +99,7 @@ def generate_salt():
salt_choices = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \ salt_choices = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
"abcdefghijklmnopqrstuvwxyz" \ "abcdefghijklmnopqrstuvwxyz" \
"0123456789./" "0123456789./"
return whrandom.choice(salt_choices) return whrandom.choice(salt_choices)+whrandom.choice(salt_choices)
def generate_passwd(password, encoding): def generate_passwd(password, encoding):
encoding=string.upper(encoding) encoding=string.upper(encoding)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7