diff options
| author | Henryk Plötz <henryk@ploetzli.ch> | 2010-02-25 15:58:46 +0100 |
|---|---|---|
| committer | Henryk Plötz <henryk@ploetzli.ch> | 2010-02-26 02:27:17 +0100 |
| commit | 63d7c9d0a8fc13a79a22f8e6c23498ee97e697ca (patch) | |
| tree | 22989b23791927abcbd7e224b3fdb5f8b35c97f2 | |
| parent | 303d3ffdaf6cf00c1f682ddeb6b96d1dd32f2942 (diff) | |
sha is deprecated, move to hashlib (probably removes support for old python versions)
| -rw-r--r-- | cards/nfc_application.py | 2 | ||||
| -rw-r--r-- | cards/passport_application.py | 7 | ||||
| -rw-r--r-- | cards/vrs_application.py | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/cards/nfc_application.py b/cards/nfc_application.py index 5e80991..d92a98d 100644 --- a/cards/nfc_application.py +++ b/cards/nfc_application.py @@ -1,5 +1,5 @@ from generic_application import Application -import struct, sha, binascii, os, datetime, sys, utils +import struct, binascii, os, datetime, sys, utils class NFC_Application(Application): diff --git a/cards/passport_application.py b/cards/passport_application.py index f131ab0..2aae9c1 100644 --- a/cards/passport_application.py +++ b/cards/passport_application.py @@ -1,5 +1,6 @@ from generic_application import Application -import struct, sha, binascii, os, datetime, sys +import struct, binascii, os, datetime, sys +from hashlib import sha1 from utils import hexdump, C_APDU from tcos_card import SE_Config, TCOS_Security_Environment from generic_card import Card @@ -111,7 +112,7 @@ class Passport_Application(Application): Returns: Ka + Kb Note: Does not adjust parity. Nobody uses that anyway ...""" D = Kseed + struct.pack(">i", c) - H = sha.sha(D).digest() + H = sha1(D).digest() Ka = H[0:8] Kb = H[8:16] return Ka + Kb @@ -122,7 +123,7 @@ class Passport_Application(Application): if verbose: print "MRZ_information: '%s' + '%s' + '%s'" % (mrz2[0:10], mrz2[13:20], mrz2[21:28]) MRZ_information = mrz2[0:10] + mrz2[13:20] + mrz2[21:28] - H = sha.sha(MRZ_information).digest() + H = sha1(MRZ_information).digest() Kseed = H[:16] if verbose: print "SHA1('%s')[:16] =\nKseed = %s" % (MRZ_information, hexdump(Kseed)) diff --git a/cards/vrs_application.py b/cards/vrs_application.py index 549bb84..1c17153 100644 --- a/cards/vrs_application.py +++ b/cards/vrs_application.py @@ -1,5 +1,5 @@ from generic_application import Application -import struct, sha, binascii, os, datetime, sys, time +import struct, binascii, os, datetime, sys, time from iso_7816_4_card import ISO_7816_4_Card import utils, TLV_utils, generic_card |