small fix and added line to changelog.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4162c638d30e5d196700dda0c3f1dfbeee5effba..f1d32ae0e96f3ac88ef98bb4e92e41b18a228365 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 - Added to `hf emv exec` MSD path for VISA and Mastercard and some other compatible EMV cards (Merlok)
 - Added to `hf emv exec` SDA, DDA, fast DDA, CDA calculations for VISA and Mastercard and some other compatible EMV cards (Merlok)
 - Added `hf emv test` - crypto tests for DES, AES, SHA, RSA, SDA, DDA, CDA and some other crypto functions (Merlok)
 - Added to `hf emv exec` MSD path for VISA and Mastercard and some other compatible EMV cards (Merlok)
 - Added to `hf emv exec` SDA, DDA, fast DDA, CDA calculations for VISA and Mastercard and some other compatible EMV cards (Merlok)
 - Added `hf emv test` - crypto tests for DES, AES, SHA, RSA, SDA, DDA, CDA and some other crypto functions (Merlok)

+- Added `hf list mf` - deciphers crypto1 stream and works with first authentication and weak nested authentications (Merlok)

 
 ## [3.0.1][2017-06-08]
 
 
 ## [3.0.1][2017-06-08]
 

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index bbfb24c89da4209292ff6482251250debcbdb95d..82e35c271267ab131b82a0d7c504fc92e3a9e029 100644 (file)
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -325,11 +325,12 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, uint8
                        if (cmdsize == 4 && isResponse) {
                                snprintf(exp,size,"AUTH: nt %s", (AuthData.first_auth) ? "" : "(enc)");
                                MifareAuthState = masNrAr;
                        if (cmdsize == 4 && isResponse) {
                                snprintf(exp,size,"AUTH: nt %s", (AuthData.first_auth) ? "" : "(enc)");
                                MifareAuthState = masNrAr;

-                               if (AuthData.first_auth)
+                               if (AuthData.first_auth) {

                                        AuthData.nt = bytes_to_num(cmd, 4);
                                        AuthData.nt = bytes_to_num(cmd, 4);

-                               else
+                               } else {

                                        AuthData.nt_enc = bytes_to_num(cmd, 4);
                                        AuthData.nt_enc_par = parity[0];
                                        AuthData.nt_enc = bytes_to_num(cmd, 4);
                                        AuthData.nt_enc_par = parity[0];

+                               }

                                return;
                        } else {
                                MifareAuthState = masError;
                                return;
                        } else {
                                MifareAuthState = masError;