Commits · master · Java Card 18 / petrol-rations

Jun 03, 2021
- makefile update · 3a49cfa1
  Mark ten Klooster authored 3 years ago
  
  3a49cfa1
- removed unused file and updated readme · bc81b50b
  Mark ten Klooster authored 3 years ago
  
  bc81b50b
- ensure next instruction · 1572fbb8
  Mark ten Klooster authored 3 years ago
  
  1572fbb8
- some housekeeping · 4c47b3ae
  Mark ten Klooster authored 3 years ago
  
  4c47b3ae
- Merge branch 'charging_protocol' into 'master' · f81d728d
  Mark ten Klooster authored 3 years ago
  
  implemented charging See merge request !25
  f81d728d
- completed charging · 59d17297
  Mark ten Klooster authored 3 years ago
  
  59d17297
- fixes for pumping · e1f44744
  Mark ten Klooster authored 3 years ago
  
  e1f44744
- Merge branch 'master' into charging_protocol · 46109fa1
  Mark ten Klooster authored 3 years ago
  
  # Conflicts: # src/backend/Backend.java # src/card/PetrolCard.java # src/crypto/CertConstants.java # src/terminal/BaseTerminalThread.java
  46109fa1
- Merge branch 'logReadout' into 'master' · 476ec628
  Mauk Lemmen authored 3 years ago
  
  added functionality to read logs from card See merge request !24
  476ec628
Jun 02, 2021
- added functionality to read logs from card · 84bee185
  Mauk Lemmen authored 3 years ago
  
  84bee185
Jun 01, 2021
- implemented charging · 30abc623
  Mark ten Klooster authored 3 years ago
  
  30abc623
May 27, 2021
- Merge branch 'pumpingProtocol' into 'master' · 6394b761
  Mauk Lemmen authored 3 years ago
  
  Pumping protocol See merge request !23
  6394b761
- pumping works · 1b80297c
  Mauk Lemmen authored 3 years ago
  
  1b80297c
- PumpingProtocol finished · fcacf890
  Mauk Lemmen authored 3 years ago
  
  fcacf890
May 25, 2021
- added balance changing stuff · 3e27d447
  Mauk Lemmen authored 3 years ago
  
  3e27d447
May 20, 2021
- small change · 6d0e770b
  Mauk Lemmen authored 3 years ago
  
  6d0e770b
- Pumping works up to getting balance and checking and stuffs progress. · d732ee8a
  Mauk Lemmen authored 3 years ago
  
  d732ee8a
- Merged master branch (with pump terminal changes) · 88130bfd
  Mauk Lemmen authored 3 years ago
  
  88130bfd
- Merge branch 'checkCardExpiryDate' into 'master' · f846ff83
  Mauk Lemmen authored 3 years ago
  
  Card cert expiry date checking on Terminal function is implemented See merge request !19
  f846ff83
- Merge branch 'master' into 'checkCardExpiryDate' · 901a9434
  Mauk Lemmen authored 3 years ago
  
  # Conflicts: # src/personalisationTerminal/PersonalisationTerminalThread.java
  901a9434
- temp · 411c3739
  Mauk Lemmen authored 3 years ago
  
  411c3739
- Merge branch 'terminals' into 'master' · c44db8e2
  Mark ten Klooster authored 3 years ago
  
  added keys and certificates for other terminals See merge request !20
  c44db8e2
- added keys and certificates for other terminals · 7c4059d1
  Mark ten Klooster authored 3 years ago
  
  7c4059d1
- Card cert expiry date checking on Terminal function is implemented · e394b33b
  Mauk Lemmen authored 3 years ago
  
  e394b33b
- Merge branch 'nextInstruction' into 'master' · 1c84dc12
  Mark ten Klooster authored 3 years ago
  
  added nextInstruction byte to card See merge request !18
  1c84dc12
- added nextInstruction byte to card · 8c3ea5a2
  Mark ten Klooster authored 3 years ago
  
  8c3ea5a2
- Merge branch 'fullDataExchange' into 'master' · 47caf934
  Steffan Borgers authored 3 years ago
  
  DataExchange terminal side is finished. DataExchange card side is almost done... See merge request !17
  47caf934
May 19, 2021
- removed test code · 0ec6f44b
  Mark ten Klooster authored 3 years ago
  
  0ec6f44b
- minor code improvements · c02338e2
  Mark ten Klooster authored 3 years ago
  
  c02338e2
May 15, 2021
- Done implementing Data Exchange verification on card side. Fixed bug in padding on terminal · 7d87c09c
  Bart authored 3 years ago
  
  7d87c09c
- DataExchange terminal side is finished. DataExchange card side is almost done... · 34930396
  Bart authored 3 years ago
  
  DataExchange terminal side is finished. DataExchange card side is almost done (Sending is done, verification still needs to be done)
  34930396
May 13, 2021
- Merge branch 'key_exchange_improved' into 'master' · 0c0a1ef5
  Mark ten Klooster authored 3 years ago
  
  Key exchange improved See merge request !16
  0c0a1ef5
- more refactoring · 7580ad0b
  Mark ten Klooster authored 3 years ago
  
  7580ad0b
- some refactoring · 0aeb94dc
  Mark ten Klooster authored 3 years ago
  
  0aeb94dc
- fixed key exchange · b678c1cd
  Mark ten Klooster authored 3 years ago
  
  b678c1cd
- Merge branch 'mutualAuth2' into 'master' · b8c1c02a
  Mark ten Klooster authored 3 years ago
  
  Mutual auth2 See merge request !15
  b8c1c02a
May 12, 2021
- fixed code up to and including Mutual authentication · eac9c530
  Mark ten Klooster authored 3 years ago
  
  eac9c530
- implemented AES session key exchange. Still has bugs, only works sometimes · d1b70be7
  Mauk Lemmen authored 3 years ago
  
  d1b70be7
May 06, 2021
- quicksave · 7f19aa3e
  Mauk Lemmen authored 3 years ago
  
  7f19aa3e
- more merged stuff · c4455315
  Mark ten Klooster authored 3 years ago
  
  c4455315