git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get some basic pubsub groups information from our xmpp client
[plcapi.git]
/
PLC
/
Auth.py
diff --git
a/PLC/Auth.py
b/PLC/Auth.py
index
8793693
..
08c9d2c
100644
(file)
--- a/
PLC/Auth.py
+++ b/
PLC/Auth.py
@@
-5,10
+5,14
@@
# Copyright (C) 2006 The Trustees of Princeton University
#
# $Id$
# Copyright (C) 2006 The Trustees of Princeton University
#
# $Id$
+# $URL$
#
import crypt
#
import crypt
-import sha
+try:
+ from hashlib import sha1 as sha
+except ImportError:
+ import sha
import hmac
import time
import hmac
import time
@@
-255,7
+259,8
@@
class BootAuth(Auth):
# We encode in UTF-8 before calculating the HMAC, which is
# an 8-bit algorithm.
# We encode in UTF-8 before calculating the HMAC, which is
# an 8-bit algorithm.
- digest = hmac.new(key, msg.encode('utf-8'), sha).hexdigest()
+ # python 2.6 insists on receiving a 'str' as opposed to a 'unicode'
+ digest = hmac.new(str(key), msg.encode('utf-8'), sha).hexdigest()
if digest != auth['value']:
raise PLCAuthenticationFailure, "Call could not be authenticated"
if digest != auth['value']:
raise PLCAuthenticationFailure, "Call could not be authenticated"