Merged with master

This commit is contained in:
Martin Holst Swende committed 2015-01-31 18:21:38 +01:00
commit 0644d5e3a3
77 files changed
+441264 -1209

No files matched your search

+3 -3
View File
@@ -14,8 +14,8 @@
typedef enum {
RHT2F_PASSWORD = 21,
RHT2F_AUTHENTICATE = 22,
RHT2F_CRYPTO = 23,
RHT2F_TEST_AUTH_ATTEMPTS = 25,
RHT2F_CRYPTO = 23,
RHT2F_TEST_AUTH_ATTEMPTS = 25,
} hitag_function;
typedef struct {
@@ -33,7 +33,7 @@ typedef struct {
typedef union {
rht2d_password pwd;
rht2d_authenticate auth;
rht2d_crypto crypto;
rht2d_crypto crypto;
} hitag_data;
#endif