From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 Jan 2016 19:17:08 +0000 (+0100)
Subject: CHG: Syntax suger
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/da198be4b5ae28a3d1c711b31081aba5af33ed6d?ds=sidebyside;hp=--cc
CHG: Syntax suger
---
da198be4b5ae28a3d1c711b31081aba5af33ed6d
diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index da86e9d3..b3a9a132 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -27,7 +27,7 @@ static uint16_t BigBuf_hi = BIGBUF_SIZE;
static uint8_t *emulator_memory = NULL;
// trace related variables
-static uint16_t traceLen = 0;
+static uint16_t traceLen;
int tracing = 1; //Last global one.. todo static?
// get the address of BigBuf
diff --git a/armsrc/aes.c b/armsrc/aes.c
index a199d04b..dc89a1cf 100644
--- a/armsrc/aes.c
+++ b/armsrc/aes.c
@@ -1152,7 +1152,7 @@ int main()
if( AesCtxIni(&ctx, iv, key, KEY128, CBC) < 0)
printf("init error\n");
- if (AesEncrypt(&ctx, databuf, databuf, sizeof databuf) < 0)
+ if (AesEncrypt(&ctx, databuf, databuf, sizeof(databuf) ) < 0)
printf("error in encryption\n");
// initialize context and decrypt cipher at other end
@@ -1160,7 +1160,7 @@ int main()
if( AesCtxIni(&ctx, iv, key, KEY128, CBC) < 0)
printf("init error\n");
- if (AesDecrypt(&ctx, databuf, databuf, sizeof databuf) < 0)
+ if (AesDecrypt(&ctx, databuf, databuf, sizeof(databuf) ) < 0)
printf("error in decryption\n");
printf("%s\n", databuf);
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 10db4a39..3dfa5267 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -57,19 +57,17 @@ void ToSendReset(void)
ToSendBit = 8;
}
-void ToSendStuffBit(int b)
-{
+void ToSendStuffBit(int b) {
if(ToSendBit >= 8) {
- ToSendMax++;
+ ++ToSendMax;
ToSend[ToSendMax] = 0;
ToSendBit = 0;
}
- if(b) {
+ if(b)
ToSend[ToSendMax] |= (1 << (7 - ToSendBit));
- }
- ToSendBit++;
+ ++ToSendBit;
if(ToSendMax >= sizeof(ToSend)) {
ToSendBit = 0;
@@ -81,22 +79,20 @@ void ToSendStuffBit(int b)
// Debug print functions, to go out over USB, to the usual PC-side client.
//=============================================================================
-void DbpString(char *str)
-{
+void DbpString(char *str) {
byte_t len = strlen(str);
cmd_send(CMD_DEBUG_PRINT_STRING,len,0,0,(byte_t*)str,len);
}
#if 0
-void DbpIntegers(int x1, int x2, int x3)
-{
+void DbpIntegers(int x1, int x2, int x3) {
cmd_send(CMD_DEBUG_PRINT_INTEGERS,x1,x2,x3,0,0);
}
#endif
void Dbprintf(const char *fmt, ...) {
-// should probably limit size here; oh well, let's just use a big buffer
- char output_string[128];
+ // should probably limit size here; oh well, let's just use a big buffer
+ char output_string[128] = {0x00};
va_list ap;
va_start(ap, fmt);
@@ -108,28 +104,27 @@ void Dbprintf(const char *fmt, ...) {
// prints HEX & ASCII
void Dbhexdump(int len, uint8_t *d, bool bAsci) {
- int l=0,i;
+ int l=0, i;
char ascii[9];
while (len>0) {
- if (len>8) l=8;
- else l=len;
+
+ l = (len>8) ? 8 : len;
memcpy(ascii,d,l);
ascii[l]=0;
// filter safe ascii
- for (i=0;i<l;i++)
+ for (i=0; i<l; ++i)
if (ascii[i]<32 || ascii[i]>126) ascii[i]='.';
- if (bAsci) {
+ if (bAsci)
Dbprintf("%-8s %*D",ascii,l,d," ");
- } else {
+ else
Dbprintf("%*D",l,d," ");
- }
- len-=8;
- d+=8;
+ len -= 8;
+ d += 8;
}
}
@@ -163,10 +158,9 @@ static int ReadAdc(int ch)
AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
- while(!(AT91C_BASE_ADC->ADC_SR & ADC_END_OF_CONVERSION(ch)))
- ;
+ while (!(AT91C_BASE_ADC->ADC_SR & ADC_END_OF_CONVERSION(ch))) ;
+
d = AT91C_BASE_ADC->ADC_CDR[ch];
-
return d;
}
@@ -175,15 +169,13 @@ int AvgAdc(int ch) // was static - merlok
int i;
int a = 0;
- for(i = 0; i < 32; i++) {
+ for(i = 0; i < 32; ++i)
a += ReadAdc(ch);
- }
return (a + 15) >> 5;
}
-void MeasureAntennaTuning(void)
-{
+void MeasureAntennaTuning(void) {
uint8_t LF_Results[256];
int i, adcval = 0, peak = 0, peakv = 0, peakf = 0; //ptr = 0
int vLf125 = 0, vLf134 = 0, vHf = 0; // in mV
@@ -201,8 +193,9 @@ void MeasureAntennaTuning(void)
FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
+
for (i=255; i>=19; i--) {
- WDT_HIT();
+ WDT_HIT();
FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i);
SpinDelay(20);
adcval = ((MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10);
@@ -229,13 +222,11 @@ void MeasureAntennaTuning(void)
cmd_send(CMD_MEASURED_ANTENNA_TUNING, vLf125 | (vLf134<<16), vHf, peakf | (peakv<<16), LF_Results, 256);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LED_A_OFF();
- LED_B_OFF();
- return;
+
+ LEDsoff();
}
-void MeasureAntennaTuningHf(void)
-{
+void MeasureAntennaTuningHf(void) {
int vHf = 0; // in mV
DbpString("Measuring HF antenna, press button to exit");
@@ -251,15 +242,13 @@ void MeasureAntennaTuningHf(void)
Dbprintf("%d mV",vHf);
if (BUTTON_PRESS()) break;
}
+
DbpString("cancelled");
-
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-
}
-void ReadMem(int addr)
-{
+void ReadMem(int addr) {
const uint8_t *data = ((uint8_t *)addr);
Dbprintf("%x: %02x %02x %02x %02x %02x %02x %02x %02x",
@@ -280,6 +269,7 @@ void SendVersion(void)
* pointer, then use it.
*/
char *bootrom_version = *(char**)&_bootphase1_version_pointer;
+
if( bootrom_version < &_flash_start || bootrom_version >= &_flash_end ) {
strcat(VersionString, "bootrom version information appears invalid\n");
} else {
@@ -292,6 +282,7 @@ void SendVersion(void)
FpgaGatherVersion(FPGA_BITSTREAM_LF, temp, sizeof(temp));
strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1);
+
FpgaGatherVersion(FPGA_BITSTREAM_HF, temp, sizeof(temp));
strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1);
@@ -333,8 +324,7 @@ void printUSBSpeed(void)
/**
* Prints runtime information about the PM3.
**/
-void SendStatus(void)
-{
+void SendStatus(void) {
BigBuf_print_status();
Fpga_print_status();
printConfig(); //LF Sampling config
@@ -782,16 +772,14 @@ static const char LIGHT_SCHEME[] = {
};
static const int LIGHT_LEN = sizeof(LIGHT_SCHEME)/sizeof(LIGHT_SCHEME[0]);
-void ListenReaderField(int limit)
-{
- int lf_av, lf_av_new, lf_baseline= 0, lf_max;
- int hf_av, hf_av_new, hf_baseline= 0, hf_max;
- int mode=1, display_val, display_max, i;
-
+void ListenReaderField(int limit) {
#define LF_ONLY 1
#define HF_ONLY 2
#define REPORT_CHANGE 10 // report new values only if they have changed at least by REPORT_CHANGE
+ int lf_av, lf_av_new, lf_baseline= 0, lf_max;
+ int hf_av, hf_av_new, hf_baseline= 0, hf_max;
+ int mode=1, display_val, display_max, i;
// switch off FPGA - we don't want to measure our own signal
FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -1400,9 +1388,8 @@ void __attribute__((noreturn)) AppMain(void)
for(;;) {
if (usb_poll()) {
rx_len = usb_read(rx,sizeof(UsbCommand));
- if (rx_len) {
+ if (rx_len)
UsbPacketReceived(rx,rx_len);
- }
}
WDT_HIT();
diff --git a/armsrc/crapto1.c b/armsrc/crapto1.c
index 627cce4f..a6b6da4d 100644
--- a/armsrc/crapto1.c
+++ b/armsrc/crapto1.c
@@ -24,9 +24,9 @@
static uint8_t filterlut[1 << 20];
static void __attribute__((constructor)) fill_lut()
{
- uint32_t i;
- for(i = 0; i < 1 << 20; ++i)
- filterlut[i] = filter(i);
+ uint32_t i;
+ for(i = 0; i < 1 << 20; ++i)
+ filterlut[i] = filter(i);
}
#define filter(x) (filterlut[(x) & 0xfffff])
#endif
@@ -509,7 +509,6 @@ static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, ui
* It returns a zero terminated list of possible cipher states after the
* tag nonce was fed in
*/
-
struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
{
struct Crypto1State *statelist, *s;
diff --git a/armsrc/crypto1.c b/armsrc/crypto1.c
index a212ecc4..98d38b2b 100644
--- a/armsrc/crypto1.c
+++ b/armsrc/crypto1.c
@@ -20,18 +20,15 @@
#include "crapto1.h"
#include <stdlib.h>
-
void crypto1_create(struct Crypto1State *s, uint64_t key)
{
// struct Crypto1State *s = malloc(sizeof(*s));
- s->odd = s->even = 0;
int i;
for(i = 47;s && i > 0; i -= 2) {
s->odd = s->odd << 1 | BIT(key, (i - 1) ^ 7);
s->even = s->even << 1 | BIT(key, i ^ 7);
}
- return;
}
void crypto1_destroy(struct Crypto1State *state)
{
diff --git a/armsrc/desfire_crypto.c b/armsrc/desfire_crypto.c
index 469a8ec4..acce980f 100644
--- a/armsrc/desfire_crypto.c
+++ b/armsrc/desfire_crypto.c
@@ -226,8 +226,8 @@ void* mifare_cryto_preprocess_data (desfiretag_t tag, void *data, size_t *nbytes
cmac (key, DESFIRE (tag)->ivect, res, *nbytes, DESFIRE (tag)->cmac);
if (append_mac) {
- maced_data_length (key, *nbytes);
-
+ size_t len = maced_data_length (key, *nbytes);
+ ++len;
memcpy (res, data, *nbytes);
memcpy (res + *nbytes, DESFIRE (tag)->cmac, CMAC_LENGTH);
*nbytes += CMAC_LENGTH;
diff --git a/armsrc/epa.c b/armsrc/epa.c
index b89d4956..3b4e341a 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -102,7 +102,7 @@ static struct {
static uint8_t apdu_lengths_replay[5];
// type of card (ISO 14443 A or B)
-static char iso_type = 0;
+static char iso_type;
//-----------------------------------------------------------------------------
// Wrapper for sending APDUs to type A and B cards