From ef4e7fdb2ea362eaf65d5a9eab6507075a2df453 Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Thu, 24 Jul 2025 18:18:30 +0100 Subject: [PATCH] - L2 security: ignore GOOSE message when MAC validation failes or security extension is missing (LIB61850-329) --- src/goose/goose_receiver.c | 22 +++- src/goose/goose_sec.c | 199 ++++++++++++++++++++----------------- 2 files changed, 123 insertions(+), 98 deletions(-) diff --git a/src/goose/goose_receiver.c b/src/goose/goose_receiver.c index e6de927d..fbefd4e4 100644 --- a/src/goose/goose_receiver.c +++ b/src/goose/goose_receiver.c @@ -1111,8 +1111,6 @@ parseGooseMessage(GooseReceiver self, uint8_t* buffer, int numbytes) int apduLength = length - 8; - printf("length: %i apduLength: %i numBytes: %i secExtLength: %i\n", length, apduLength, numbytes, secExtLength); - if (apduLength < 0) { if (DEBUG_GOOSE_SUBSCRIBER) @@ -1149,11 +1147,11 @@ parseGooseMessage(GooseReceiver self, uint8_t* buffer, int numbytes) if (secExtCrc == crc) { - printf("CRC check - OK\n"); + printf("GOOSE_SUBSCRIBER: CRC check - OK\n"); } else { - printf("CRC check - FAILED (expected: %04x actual: %04x)\n", secExtCrc, crc); + printf("GOOSE_SUBSCRIBER: CRC check - FAILED (expected: %04x actual: %04x)\n", secExtCrc, crc); } /* verify correct length of message including security extension */ @@ -1172,7 +1170,13 @@ parseGooseMessage(GooseReceiver self, uint8_t* buffer, int numbytes) //secCheckPassed = L2Security_checkSecurityExtension(self->l2Security, buffer, 16, 182, secExtLength); - printf("Security check - %s\n", secCheckPassed ? "OK" : "FAILED"); + printf("GOOSE_SUBSCRIBER: Security check - %s\n", secCheckPassed ? "OK" : "FAILED"); + + if (secCheckPassed == false) + { + printf("GOOSE_SUBSCRIBER: security check failed -> ignore message\n"); + return; + } } else { @@ -1182,6 +1186,14 @@ parseGooseMessage(GooseReceiver self, uint8_t* buffer, int numbytes) secCheckPassed = false; } } + else + { + if (self->l2Security) + { + printf("GOOSE SUBSCRIBER: ERROR - no security extension\n"); + return; + } + } /* check if there is an interested subscriber */ LinkedList element = LinkedList_getNext(self->subscriberList); diff --git a/src/goose/goose_sec.c b/src/goose/goose_sec.c index b340d738..5b4c5ef4 100644 --- a/src/goose/goose_sec.c +++ b/src/goose/goose_sec.c @@ -24,9 +24,9 @@ #include #include -#include "l2_security.h" -#include "ber_encoder.h" #include "ber_decode.h" +#include "ber_encoder.h" +#include "l2_security.h" #include "r_session_crypto.h" struct sL2Security @@ -41,40 +41,26 @@ struct sL2Security int timeToNextKey; }; -static uint16_t poly[] = { - 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, - 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7, - 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e, - 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876, - 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd, - 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5, - 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c, - 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974, - 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb, - 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3, - 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a, - 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72, - 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9, - 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1, - 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738, - 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70, - 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7, - 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff, - 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036, - 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e, - 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5, - 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd, - 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134, - 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c, - 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3, - 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb, - 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232, - 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a, - 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1, - 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9, - 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330, - 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 -}; +static uint16_t poly[] = { + 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, + 0xe97e, 0xf8f7, 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e, 0x9cc9, 0x8d40, 0xbfdb, 0xae52, + 0xdaed, 0xcb64, 0xf9ff, 0xe876, 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd, 0xad4a, 0xbcc3, + 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5, 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c, + 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974, 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, + 0x2732, 0x36bb, 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3, 0x5285, 0x430c, 0x7197, 0x601e, + 0x14a1, 0x0528, 0x37b3, 0x263a, 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72, 0x6306, 0x728f, + 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9, 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1, + 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738, 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, + 0x9af9, 0x8b70, 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7, 0x0840, 0x19c9, 0x2b52, 0x3adb, + 0x4e64, 0x5fed, 0x6d76, 0x7cff, 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036, 0x18c1, 0x0948, + 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e, 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5, + 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd, 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, + 0xd0bd, 0xc134, 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c, 0xc60c, 0xd785, 0xe51e, 0xf497, + 0x8028, 0x91a1, 0xa33a, 0xb2b3, 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb, 0xd68d, 0xc704, + 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232, 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a, + 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1, 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, + 0x0e70, 0x1ff9, 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330, 0x7bc7, 0x6a4e, 0x58d5, 0x495c, + 0x3de3, 0x2c6a, 0x1ef1, 0x0f78}; /* see https://www.rfc-editor.org/rfc/rfc1662#page-19 */ static uint16_t @@ -84,7 +70,8 @@ calculateCRC(uint8_t* data, int size) int i; - for (i = 0; i < size; i++) { + for (i = 0; i < size; i++) + { crc = (uint16_t)(((uint16_t)(crc >> 8)) ^ poly[(crc ^ data[i]) & 0xff]); } @@ -109,17 +96,16 @@ printBuffer(uint8_t* buffer, int size) /** * \brief Create the security extension - * + * * \param buffer buffer with the encoded GOOSE message (security extension will be added) * \param start start of the message payload used to calculate the MAC - * \param length length of the message payload - * + * \param length length of the message payload + * * \return length of the security extension */ uint16_t L2Security_addSecurityExtension(L2Security self, uint8_t* buffer, int start, int length, int maxBufSize, bool encode) { - printf("L2Security_addSecurityExtension: start=%i, length=%i, maxBufSize=%i\n", start, length, maxBufSize); if (self->currentSigAlgo != MC_SEC_SIG_ALGO_NONE) { int ivSize = 0; @@ -127,30 +113,37 @@ L2Security_addSecurityExtension(L2Security self, uint8_t* buffer, int start, int uint8_t* ivBuf = NULL; /* determine length of the mAC */ - if (self->currentSigAlgo == MC_SEC_SIG_ALGO_HMAC_SHA256_128) { + if (self->currentSigAlgo == MC_SEC_SIG_ALGO_HMAC_SHA256_128) + { mACSize = 2 + 16; } - else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_HMAC_SHA256_256) { + else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_HMAC_SHA256_256) + { mACSize = 2 + 32; } - else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_AES_GMAC_128) { + else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_AES_GMAC_128) + { mACSize = 2 + 16; - ivSize = 12; /* IV size for AES GMAC (recommendation from NIST: https://web.cs.ucdavis.edu/~rogaway/ocb/gcm.pdf) */ + ivSize = 12; /* IV size for AES GMAC (recommendation from NIST: + https://web.cs.ucdavis.edu/~rogaway/ocb/gcm.pdf) */ } - else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_AES_GMAC_256) { + else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_AES_GMAC_256) + { mACSize = 2 + 32; - ivSize = 12; /* IV size for AES GMAC (recommendation from NIST: https://web.cs.ucdavis.edu/~rogaway/ocb/gcm.pdf) */ + ivSize = 12; /* IV size for AES GMAC (recommendation from NIST: + https://web.cs.ucdavis.edu/~rogaway/ocb/gcm.pdf) */ } - else { + else + { /* signature algorithm not supported */ - printf("Signature algorithm not supported\n"); + printf("L2_SECURITY: Signature algorithm not supported\n"); return 0; } uint32_t securityExtensionSize = 0; /* TODO check for applicable/valid key */ - + /* determine length of the AuthenticationValue */ uint32_t authValueSize = 3; /* TLV(Version) */ @@ -177,7 +170,8 @@ L2Security_addSecurityExtension(L2Security self, uint8_t* buffer, int start, int int bufPos = start + length; - if (bufPos + securityExtensionSize > maxBufSize) { + if (bufPos + securityExtensionSize > maxBufSize) + { printf("L2_SECURITY: security extension doesn't fit into message\n"); return 0; } @@ -192,7 +186,7 @@ L2Security_addSecurityExtension(L2Security self, uint8_t* buffer, int start, int /* encode AuthenticationValue content */ /* Version */ - bufPos = BerEncoder_encodeInt32WithTL(0x80, 1, buffer, bufPos); + bufPos = BerEncoder_encodeInt32WithTL(0x80, 1, buffer, bufPos); /* TimeofCurrentKey */ bufPos = BerEncoder_encodeInt32WithTL(0x81, self->timeOfCurrentKey, buffer, bufPos); @@ -216,24 +210,30 @@ L2Security_addSecurityExtension(L2Security self, uint8_t* buffer, int start, int /* encode mAC */ bufPos = BerEncoder_encodeTL(0x85, mACSize - 2, buffer, bufPos); - if (self->currentSigAlgo == MC_SEC_SIG_ALGO_HMAC_SHA256_128) { - RSessionCrypto_createHMAC(buffer + start, macEnd, self->currentKey, self->currentKeySize, buffer + bufPos, 16); + if (self->currentSigAlgo == MC_SEC_SIG_ALGO_HMAC_SHA256_128) + { + RSessionCrypto_createHMAC(buffer + start, macEnd, self->currentKey, self->currentKeySize, + buffer + bufPos, 16); bufPos += 16; } - else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_HMAC_SHA256_256) { - RSessionCrypto_createHMAC(buffer + start, macEnd - start, self->currentKey, self->currentKeySize, buffer + bufPos, 32); + else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_HMAC_SHA256_256) + { + RSessionCrypto_createHMAC(buffer + start, macEnd - start, self->currentKey, self->currentKeySize, + buffer + bufPos, 32); bufPos += 32; } else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_AES_GMAC_128) { /* create IV */ - if (RSessionCrypto_createRandomData(ivBuf, ivSize) == false) { - printf("ERROR - Failed to create random IV\n"); + if (RSessionCrypto_createRandomData(ivBuf, ivSize) == false) + { + printf("L2_SECURITY: ERROR - Failed to create random IV\n"); } - if (RSessionCrypto_createAES_GMAC(self->currentKey, self->currentKeySize, ivBuf, ivSize, buffer + start, macEnd - start, buffer + bufPos, 16) == false) + if (RSessionCrypto_createAES_GMAC(self->currentKey, self->currentKeySize, ivBuf, ivSize, buffer + start, + macEnd - start, buffer + bufPos, 16) == false) { - printf("ERROR - Failed to create GMAC\n"); + printf("L2_SECURITY: ERROR - Failed to create GMAC\n"); } bufPos += 16; @@ -241,20 +241,23 @@ L2Security_addSecurityExtension(L2Security self, uint8_t* buffer, int start, int else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_AES_GMAC_256) { /* create IV */ - if (RSessionCrypto_createRandomData(ivBuf, ivSize) == false) { - printf("ERROR - Failed to create random IV\n"); + if (RSessionCrypto_createRandomData(ivBuf, ivSize) == false) + { + printf("L2_SECURITY: ERROR - Failed to create random IV\n"); } - if (RSessionCrypto_createAES_GMAC(self->currentKey, self->currentKeySize, ivBuf, ivSize, buffer + start, macEnd - start, buffer + bufPos, 32) == false) + if (RSessionCrypto_createAES_GMAC(self->currentKey, self->currentKeySize, ivBuf, ivSize, buffer + start, + macEnd - start, buffer + bufPos, 32) == false) { - printf("ERROR - Failed to create GMAC\n"); + printf("L2_SECURITY: ERROR - Failed to create GMAC\n"); } bufPos += 32; } - else { + else + { /* signature algorithm not supported */ - printf("Signature algorithm not supported\n"); + printf("L2_SECURITY: Signature algorithm not supported\n"); return 0; } } @@ -279,19 +282,24 @@ checkSecurityExtension(L2Security self, uint8_t* buffer, int secExtLen, uint8_t* int bufPos = 0; /* determine length of the mAC */ - if (self->currentSigAlgo == MC_SEC_SIG_ALGO_HMAC_SHA256_128) { + if (self->currentSigAlgo == MC_SEC_SIG_ALGO_HMAC_SHA256_128) + { mACSize = 2 + 16; } - else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_HMAC_SHA256_256) { + else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_HMAC_SHA256_256) + { mACSize = 2 + 32; } - else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_AES_GMAC_128) { + else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_AES_GMAC_128) + { mACSize = 2 + 16; } - else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_AES_GMAC_256) { + else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_AES_GMAC_256) + { mACSize = 2 + 32; } - else { + else + { /* signature algorithm not supported */ printf("L2_SECURITY: signature algorithm not supported\n"); return false; @@ -393,11 +401,12 @@ checkSecurityExtension(L2Security self, uint8_t* buffer, int secExtLen, uint8_t* if (self->currentSigAlgo == MC_SEC_SIG_ALGO_HMAC_SHA256_128) { - printf("Algo: HMAC_SHA256_128\n"); + printf("L2_SECURITY: Algo=HMAC_SHA256_128\n"); uint8_t calculatedMac[16]; - RSessionCrypto_createHMAC(macStart, macEnd, self->currentKey, self->currentKeySize, calculatedMac, sizeof(calculatedMac)); + RSessionCrypto_createHMAC(macStart, macEnd, self->currentKey, self->currentKeySize, calculatedMac, + sizeof(calculatedMac)); if (memcmp(calculatedMac, mACBuffer, 16) != 0) { @@ -407,11 +416,12 @@ checkSecurityExtension(L2Security self, uint8_t* buffer, int secExtLen, uint8_t* } else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_HMAC_SHA256_256) { - printf("Algo: HMAC_SHA256_256\n"); + printf("L2_SECURITY: Algo=HMAC_SHA256_256\n"); uint8_t calculatedMac[32]; - RSessionCrypto_createHMAC(macStart, macEnd, self->currentKey, self->currentKeySize, calculatedMac, sizeof(calculatedMac)); + RSessionCrypto_createHMAC(macStart, macEnd, self->currentKey, self->currentKeySize, calculatedMac, + sizeof(calculatedMac)); if (memcmp(calculatedMac, mACBuffer, 32) != 0) { @@ -421,17 +431,18 @@ checkSecurityExtension(L2Security self, uint8_t* buffer, int secExtLen, uint8_t* } else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_AES_GMAC_128) { - printf("Algo: AES_GMAC_128\n"); + printf("L2_SECURITY: Algo=AES_GMAC_128\n"); uint8_t calculatedMac[16]; - printf("IV: "); + printf("L2_SECURITY: IV="); printBuffer(ivBuffer, ivSize); - printf("MAC: "); + printf("L2_SECURITY: MAC="); printBuffer(mACBuffer, mACSize); - if (RSessionCrypto_createAES_GMAC(self->currentKey, self->currentKeySize, ivBuffer, ivSize, macStart, macEnd, calculatedMac, 16) == false) + if (RSessionCrypto_createAES_GMAC(self->currentKey, self->currentKeySize, ivBuffer, ivSize, macStart, + macEnd, calculatedMac, 16) == false) { printf("L2_SECURITY: GMAC calculation failed\n"); return false; @@ -445,17 +456,18 @@ checkSecurityExtension(L2Security self, uint8_t* buffer, int secExtLen, uint8_t* } else if (self->currentSigAlgo == MC_SEC_SIG_ALGO_AES_GMAC_256) { - printf("Algo: AES_GMAC_256\n"); + printf("L2_SECURITY: Algo=AES_GMAC_256\n"); - printf("IV: "); + printf("L2_SECURITY: IV="); printBuffer(ivBuffer, ivSize); - printf("MAC: "); + printf("L2_SECURITY: MAC="); printBuffer(mACBuffer, mACSize); uint8_t calculatedMac[8]; - if (RSessionCrypto_createAES_GMAC(self->currentKey, self->currentKeySize, ivBuffer, ivSize, macStart, macEnd, calculatedMac, 32) == false) + if (RSessionCrypto_createAES_GMAC(self->currentKey, self->currentKeySize, ivBuffer, ivSize, macStart, + macEnd, calculatedMac, 32) == false) { printf("L2_SECURITY: GMAC calculation failed\n"); return false; @@ -473,7 +485,8 @@ checkSecurityExtension(L2Security self, uint8_t* buffer, int secExtLen, uint8_t* return false; } } - else { + else + { printf("L2_SECURITY: invalid tag %02x in security extension\n", tag); return false; @@ -482,7 +495,6 @@ checkSecurityExtension(L2Security self, uint8_t* buffer, int secExtLen, uint8_t* bufPos += len; } - return true; } @@ -501,7 +513,7 @@ L2Security_checkSecurityExtension(L2Security self, uint8_t* buffer, int start, i return true; } } - else + else { uint8_t* secExtBuf = buffer + start + length; @@ -526,7 +538,8 @@ L2Security_checkSecurityExtension(L2Security self, uint8_t* buffer, int start, i printf("L2_SECURITY: found security extension\n"); return checkSecurityExtension(self, secExtBuf + bufPos, len, buffer + start - 2); } - else { + else + { printf("L2_SECURITY: invalid tag %02x in security extension\n", tag); return false; } @@ -541,15 +554,16 @@ L2Security_create() { L2Security self = (L2Security)GLOBAL_CALLOC(1, sizeof(struct sL2Security)); - if (self) { - + if (self) + { } return self; } MCKeyError -L2Security_addKey(L2Security self, uint32_t keyId, uint8_t* key, int keyLength, MCSecurityAlgorithm secAlgo, MCSignatureAlgorithm sigAlgo) +L2Security_addKey(L2Security self, uint32_t keyId, uint8_t* key, int keyLength, MCSecurityAlgorithm secAlgo, + MCSignatureAlgorithm sigAlgo) { self->currentKeyId = keyId; self->currentSigAlgo = sigAlgo; @@ -560,13 +574,11 @@ L2Security_addKey(L2Security self, uint32_t keyId, uint8_t* key, int keyLength, MCKeyError L2Security_removeKey(L2Security self, uint32_t keyId) { - } void L2Security_removeAllKeys(L2Security self) { - } RSessionError @@ -578,7 +590,8 @@ L2Security_setActiveKey(L2Security self, uint32_t keyId) void L2Security_destroy(L2Security self) { - if (self) { + if (self) + { GLOBAL_FREEMEM(self); } }