c0de/SmartPGP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix transaction problem with PIN changes

Browse Source
This commit is contained in:
Arnaud Fontaine
2017-07-07 19:33:48 +02:00
parent c3bab4a1b2
commit f693a7290e
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/fr/anssi/smartpgp/SmartPGPApplet.java
View File

@@ -616,13 +616,13 @@ public final class SmartPGPApplet extends Applet {
ISOException.throwIt(ISO7816.SW_SECURITY_STATUS_NOT_SATISFIED); ISOException.throwIt(ISO7816.SW_SECURITY_STATUS_NOT_SATISFIED);
return; return;
} }
transients.setUserPinMode81(false);
transients.setUserPinMode82(false);
JCSystem.beginTransaction(); JCSystem.beginTransaction();
data.user_pin.update(transients.buffer, off, (byte)(lc - off)); data.user_pin.update(transients.buffer, off, (byte)(lc - off));
data.user_pin_length = off; data.user_pin_length = off;
data.user_pin.resetAndUnblock();
transients.setUserPinMode81(false);
transients.setUserPinMode82(false);
JCSystem.commitTransaction(); JCSystem.commitTransaction();
data.user_pin.resetAndUnblock();
break; break;
case (byte)0x83: case (byte)0x83:
@@ -639,8 +639,8 @@ public final class SmartPGPApplet extends Applet {
JCSystem.beginTransaction(); JCSystem.beginTransaction();
data.admin_pin.update(transients.buffer, off, (byte)(lc - off)); data.admin_pin.update(transients.buffer, off, (byte)(lc - off));
data.admin_pin_length = off; data.admin_pin_length = off;
data.admin_pin.resetAndUnblock();;
JCSystem.commitTransaction(); JCSystem.commitTransaction();
data.admin_pin.resetAndUnblock();;
break; break;
default: default:
@@ -673,11 +673,13 @@ public final class SmartPGPApplet extends Applet {
ISOException.throwIt(ISO7816.SW_SECURITY_STATUS_NOT_SATISFIED); ISOException.throwIt(ISO7816.SW_SECURITY_STATUS_NOT_SATISFIED);
return; return;
} }
transients.setUserPinMode81(false);
transients.setUserPinMode82(false);
JCSystem.beginTransaction(); JCSystem.beginTransaction();
data.user_pin.update(transients.buffer, off, (byte)(lc - off)); data.user_pin.update(transients.buffer, off, (byte)(lc - off));
data.user_pin_length = off; data.user_pin_length = off;
data.user_pin.resetAndUnblock();
JCSystem.commitTransaction(); JCSystem.commitTransaction();
data.user_pin.resetAndUnblock();
break; break;
case (byte)0x02: case (byte)0x02:
@@ -687,11 +689,13 @@ public final class SmartPGPApplet extends Applet {
ISOException.throwIt(ISO7816.SW_WRONG_LENGTH); ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);
return; return;
} }
transients.setUserPinMode81(false);
transients.setUserPinMode82(false);
JCSystem.beginTransaction(); JCSystem.beginTransaction();
data.user_pin_length = (byte)lc; data.user_pin_length = (byte)lc;
data.user_pin.update(transients.buffer, (short)0, data.user_pin_length); data.user_pin.update(transients.buffer, (short)0, data.user_pin_length);
data.user_pin.resetAndUnblock();
JCSystem.commitTransaction(); JCSystem.commitTransaction();
data.user_pin.resetAndUnblock();
break; break;
default: default:
@@ -1029,20 +1033,17 @@ public final class SmartPGPApplet extends Applet {
break; break;
case Constants.TAG_RESETTING_CODE: case Constants.TAG_RESETTING_CODE:
assertAdmin(); assertAdmin();
if((lc < Constants.USER_PUK_MIN_SIZE) || if((lc < Constants.USER_PUK_MIN_SIZE) ||
(lc > Constants.USER_PUK_MAX_SIZE)) { (lc > Constants.USER_PUK_MAX_SIZE)) {
ISOException.throwIt(ISO7816.SW_WRONG_LENGTH); ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);
return; return;
} }
JCSystem.beginTransaction(); JCSystem.beginTransaction();
data.user_puk_length = (byte)lc; data.user_puk_length = (byte)lc;
data.user_puk.update(buf, (short)0, data.user_puk_length); data.user_puk.update(buf, (short)0, data.user_puk_length);
data.user_puk.resetAndUnblock();
JCSystem.commitTransaction(); JCSystem.commitTransaction();
data.user_puk.resetAndUnblock();
break; break;
case Constants.TAG_KEY_DERIVATION_FUNCTION: case Constants.TAG_KEY_DERIVATION_FUNCTION: