From 14c6690eb781612067e796d07455298035bb0735 Mon Sep 17 00:00:00 2001 From: oepen Date: Fri, 29 Jul 2011 16:20:57 +0000 Subject: [PATCH] Code style improvements git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@452 96b47cad-a561-4643-ad3b-153ac7d7599c --- .../src/vpicc/virtualsmartcard/SmartcardSAM.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardSAM.py b/virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardSAM.py index d14039d..7f7fdba 100644 --- a/virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardSAM.py +++ b/virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardSAM.py @@ -125,7 +125,6 @@ class CardContainer: class SAM(object): def __init__(self, PIN, cardNumber, mf=None): - import virtualsmartcard.CryptoUtils self.CardContainer = CardContainer(PIN, cardNumber) #self.CardContainer.loadConfiguration(path, password) @@ -575,8 +574,6 @@ class Security_Environment(object): class Secure_Messaging(object): def __init__(self, MF, SE=None): - import virtualsmartcard.CryptoUtils - self.mf = MF if not SE: self.current_SE = Security_Environment() @@ -911,9 +908,11 @@ class Secure_Messaging(object): if p1 != 0x9E or not p2 in (0x9A, 0xAC, 0xBC): raise SwError(SW["ERR_INCORRECTP1P2"]) + if self.current_SE.dst.key == None: raise SwError(SW["ERR_CONDITIONNOTSATISFIED"]) - + + to_sign = "" if p2 == 0x9A: #Data to be signed to_sign = data elif p2 == 0xAC: #Data objects, sign values @@ -924,7 +923,7 @@ class Secure_Messaging(object): elif p2 == 0xBC: #Data objects to be signed pass - signature = self.current_SE.dst.key.sign(data,"") + signature = self.current_SE.dst.key.sign(to_sign, "") return SW["NORMAL"], signature def hash(self, p1, p2, data):