Commit 86c82896 authored by Antoine Millet's avatar Antoine Millet
Browse files

Updated methods prototype.

parent e5842c91

ccserver/conf.py

+4 −4
Original line number Diff line number Diff line
@@ -140,11 +140,11 @@ class CCConf(object): 
        digest = hashlib.sha1(str(provided_passwd) + salt).digest()

        return '{SSHA}%s' % base64.b64encode(digest + salt)



    def _auth_sha(self, configured_passwd, provided_passwd):

    def _auth_sha(self, provided_passwd, configured_passwd=None):

        digest = hashlib.sha1(str(provided_passwd)).digest()

        return '{SHA}%s' % base64.b64encode(digest)



    def _auth_smd5(self, configured_passwd, provided_passwd):

    def _auth_smd5(self, provided_passwd, configured_passwd=None):

        if configured_passwd is not None:

            salt = self._unsaltify(configured_passwd, 16)[1]

        else:
@@ -152,11 +152,11 @@ class CCConf(object): 
        digest = hashlib.sha1(str(provided_passwd) + salt).digest()

        return '{SMD5}%s' % base64.b64encode(digest + salt)



    def _auth_md5(self, configured_passwd, provided_passwd):

    def _auth_md5(self, provided_passwd, configured_passwd=None):

        digest = hashlib.sha1(str(provided_passwd)).digest()

        return '{MD5}%s' % base64.b64encode(digest)



    def _auth_plain(self, configured_passwd, provided_passwd):

    def _auth_plain(self, provided_passwd, configured_passwd=None):

        return provided_passwd



    def _hash_password(self, password, method='ssha'):