RYTEC
/
libiec61850
mirror of https://github.com/mz-automation/libiec61850.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- MMS: fixed problem in handling of indefinite length encoded BER elements

Browse Source
pull/246/head
Michael Zillgith 5 years ago
parent cf7dbcc612
commit de6886c6f3
14 changed files with 153 additions and 2 deletions
Show Stats Download Patch File Download Diff File

36
src/mms/asn1/ber_decode.c
Unescape Escape View File

@ -24,6 +24,40 @@
#include "libiec61850_platform_includes.h" #include "libiec61850_platform_includes.h"
#include "ber_decode.h" #include "ber_decode.h"
static int
getIndefiniteLength(uint8_t* buffer, int bufPos, int maxBufPos)
{
int length = 0;
while (bufPos < maxBufPos) {
if ((buffer[bufPos] == 0) && (buffer[bufPos+1] == 0)) {
return length + 2;
}
else {
length++;
if ((buffer[bufPos++] & 0x1f) == 0x1f) {
/* handle extended tags */
bufPos++;
length++;
}
int subLength = -1;
int newBufPos = BerDecoder_decodeLength(buffer, &subLength, bufPos, maxBufPos);
if (newBufPos == -1)
return -1;
length += subLength + newBufPos - bufPos;
bufPos = newBufPos + subLength;
}
}
return -1;
}
int int
BerDecoder_decodeLength(uint8_t* buffer, int* length, int bufPos, int maxBufPos) BerDecoder_decodeLength(uint8_t* buffer, int* length, int bufPos, int maxBufPos)
{ {
@ -36,7 +70,7 @@ BerDecoder_decodeLength(uint8_t* buffer, int* length, int bufPos, int maxBufPos)
int lenLength = len1 & 0x7f; int lenLength = len1 & 0x7f;
if (lenLength == 0) { /* indefinite length form */ if (lenLength == 0) { /* indefinite length form */
*length = -1; *length = getIndefiniteLength(buffer, bufPos, maxBufPos);
} }
else { else {
*length = 0; *length = 0;

8
src/mms/iso_acse/acse.c
Unescape Escape View File

@ -230,6 +230,9 @@ parseAarePdu(AcseConnection* self, uint8_t* buffer, int bufPos, int maxBufPos)
} }
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: /* ignore unknown tag */ default: /* ignore unknown tag */
if (DEBUG_ACSE) if (DEBUG_ACSE)
printf("ACSE: parseAarePdu: unknown tag %02x\n", tag); printf("ACSE: parseAarePdu: unknown tag %02x\n", tag);
@ -363,6 +366,9 @@ parseAarqPdu(AcseConnection* self, uint8_t* buffer, int bufPos, int maxBufPos)
} }
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: /* ignore unknown tag */ default: /* ignore unknown tag */
if (DEBUG_ACSE) if (DEBUG_ACSE)
printf("ACSE: parseAarqPdu: unknown tag %02x\n", tag); printf("ACSE: parseAarqPdu: unknown tag %02x\n", tag);
@ -454,6 +460,8 @@ AcseConnection_parseMessage(AcseConnection* self, ByteBuffer* message)
case 0x64: /* A_ABORT */ case 0x64: /* A_ABORT */
indication = ACSE_ABORT; indication = ACSE_ABORT;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
if (DEBUG_ACSE) if (DEBUG_ACSE)
printf("ACSE: Unknown ACSE message\n"); printf("ACSE: Unknown ACSE message\n");

6
src/mms/iso_mms/client/mms_client_connection.c
Unescape Escape View File

@ -553,6 +553,8 @@ parseServiceError(uint8_t* buffer, int bufPos, int maxLength, MmsServiceError* e
case 0xa3: /* serviceSpecificInfo */ case 0xa3: /* serviceSpecificInfo */
bufPos += length; /* ignore */ bufPos += length; /* ignore */
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
bufPos += length; /* ignore */ bufPos += length; /* ignore */
break; break;
@ -605,6 +607,8 @@ mmsMsg_parseConfirmedErrorPDU(uint8_t* buffer, int bufPos, int maxBufPos, uint32
if (bufPos < 0) if (bufPos < 0)
goto exit_error; goto exit_error;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
bufPos += length; /* ignore */ bufPos += length; /* ignore */
break; break;
@ -673,7 +677,7 @@ exit_error:
return -1; return -1;
} }
static void void
handleAsyncResponse(MmsConnection self, ByteBuffer* response, uint32_t bufPos, MmsOutstandingCall outstandingCall, MmsError err) handleAsyncResponse(MmsConnection self, ByteBuffer* response, uint32_t bufPos, MmsOutstandingCall outstandingCall, MmsError err)
{ {

16
src/mms/iso_mms/client/mms_client_files.c
Unescape Escape View File

@ -114,6 +114,9 @@ mmsClient_handleFileOpenRequest(
bufPos += length; bufPos += length;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: /* unrecognized parameter */ default: /* unrecognized parameter */
bufPos += length; bufPos += length;
goto exit_reject_invalid_pdu; goto exit_reject_invalid_pdu;
@ -470,6 +473,8 @@ parseFileAttributes(uint8_t* buffer, int bufPos, int maxBufPos, uint32_t* fileSi
} }
} }
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
return false; return false;
} }
@ -523,6 +528,8 @@ parseDirectoryEntry(uint8_t* buffer, int bufPos, int maxBufPos, uint32_t invokeI
return false; return false;
bufPos += length; bufPos += length;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
bufPos += length; bufPos += length;
if (DEBUG_MMS_CLIENT) if (DEBUG_MMS_CLIENT)
@ -568,6 +575,8 @@ parseListOfDirectoryEntries(uint8_t* buffer, int bufPos, int maxBufPos, uint32_t
parseDirectoryEntry(buffer, bufPos, bufPos + length, invokeId, handler, parameter); parseDirectoryEntry(buffer, bufPos, bufPos + length, invokeId, handler, parameter);
bufPos += length; bufPos += length;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
bufPos += length; bufPos += length;
if (DEBUG_MMS_CLIENT) if (DEBUG_MMS_CLIENT)
@ -626,6 +635,8 @@ mmsClient_parseFileDirectoryResponse(ByteBuffer* response, int bufPos, uint32_t
moreFollows = BerDecoder_decodeBoolean(buffer, bufPos); moreFollows = BerDecoder_decodeBoolean(buffer, bufPos);
bufPos += length; bufPos += length;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
bufPos += length; bufPos += length;
if (DEBUG_MMS_CLIENT) if (DEBUG_MMS_CLIENT)
@ -684,6 +695,8 @@ mmsMsg_parseFileOpenResponse(uint8_t* buffer, int bufPos, int maxBufPos, int32_t
return false; return false;
bufPos += length; bufPos += length;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
bufPos += length; bufPos += length;
if (DEBUG_MMS_CLIENT) if (DEBUG_MMS_CLIENT)
@ -748,6 +761,9 @@ mmsMsg_parseFileReadResponse(uint8_t* buffer, int bufPos, int maxBufPos, uint32_
bufPos += length; bufPos += length;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
bufPos += length; bufPos += length;
if (DEBUG_MMS_CLIENT) if (DEBUG_MMS_CLIENT)

2
src/mms/iso_mms/client/mms_client_identify.c
Unescape Escape View File

@ -96,6 +96,8 @@ mmsClient_parseIdentifyResponse(MmsConnection self, ByteBuffer* response, uint32
case 0x83: /* list of abstract syntaxes */ case 0x83: /* list of abstract syntaxes */
bufPos += length; bufPos += length;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: /* ignore unknown tags */ default: /* ignore unknown tags */
bufPos += length; bufPos += length;
break; break;

6
src/mms/iso_mms/client/mms_client_initiate.c
Unescape Escape View File

@ -149,6 +149,9 @@ parseInitResponseDetail(MmsConnection self, uint8_t* buffer, int bufPos, int max
} }
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
break; break;
} }
@ -221,6 +224,9 @@ mmsClient_parseInitiateResponse(MmsConnection self, ByteBuffer* response)
} }
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
break; /* Ignore unknown tags */ break; /* Ignore unknown tags */
} }

21
src/mms/iso_mms/client/mms_client_journals.c
Unescape Escape View File

@ -72,6 +72,9 @@ parseJournalVariable(uint8_t* buffer, int bufPos, int maxLength, MmsJournalVaria
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
break; break;
@ -115,6 +118,9 @@ parseJournalVariables(uint8_t* buffer, int bufPos, int maxLength, MmsJournalEntr
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
break; break;
} }
@ -152,6 +158,9 @@ parseData(uint8_t* buffer, int bufPos, int maxLength, MmsJournalEntry journalEnt
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
break; break;
@ -200,6 +209,9 @@ parseEntryContent(uint8_t* buffer, int bufPos, int maxLength, MmsJournalEntry jo
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
if (DEBUG_MMS_CLIENT) if (DEBUG_MMS_CLIENT)
printf("MMS_CLIENT: parseReadJournalResponse: ignore unknown tag %02x\n", tag); printf("MMS_CLIENT: parseReadJournalResponse: ignore unknown tag %02x\n", tag);
@ -250,6 +262,9 @@ parseJournalEntry(uint8_t* buffer, int bufPos, int maxLength, LinkedList journal
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
if (DEBUG_MMS_CLIENT) if (DEBUG_MMS_CLIENT)
printf("MMS_CLIENT: parseReadJournalResponse: unknown tag %02x\n", tag); printf("MMS_CLIENT: parseReadJournalResponse: unknown tag %02x\n", tag);
@ -288,6 +303,9 @@ parseListOfJournalEntries(uint8_t* buffer, int bufPos, int maxLength, LinkedList
return false; return false;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
if (DEBUG_MMS_CLIENT) if (DEBUG_MMS_CLIENT)
printf("MMS_CLIENT: parseReadJournalResponse: unknown tag %02x\n", tag); printf("MMS_CLIENT: parseReadJournalResponse: unknown tag %02x\n", tag);
@ -353,6 +371,9 @@ mmsClient_parseReadJournalResponse(MmsConnection self, ByteBuffer* response, int
*moreFollows = BerDecoder_decodeBoolean(buffer, bufPos); *moreFollows = BerDecoder_decodeBoolean(buffer, bufPos);
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
if (DEBUG_MMS_CLIENT) if (DEBUG_MMS_CLIENT)
printf("MMS_CLIENT: mmsClient_parseReadJournalResponse: message contains unknown tag %02x!\n", tag); printf("MMS_CLIENT: mmsClient_parseReadJournalResponse: message contains unknown tag %02x!\n", tag);

2
src/mms/iso_mms/client/mms_client_status.c
Unescape Escape View File

@ -95,6 +95,8 @@ mmsClient_parseStatusResponse(MmsConnection self, ByteBuffer* response, int bufP
case 0x82: /* localDetail */ case 0x82: /* localDetail */
bufPos += length; bufPos += length;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
return false; return false;
} }

5
src/mms/iso_mms/server/mms_access_result.c
Unescape Escape View File

@ -135,6 +135,8 @@ getNumberOfElements(uint8_t* buffer, int bufPos, int elementLength)
break; break;
case 0x91: /* Utctime */ case 0x91: /* Utctime */
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
goto exit_with_error; goto exit_with_error;
} }
@ -304,6 +306,9 @@ MmsValue_decodeMmsData(uint8_t* buffer, int bufPos, int bufferLength, int* endBu
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: /* unknown tag -> decoding error */ default: /* unknown tag -> decoding error */
goto exit_with_error; goto exit_with_error;
} }

3
src/mms/iso_mms/server/mms_association_service.c
Unescape Escape View File

@ -308,6 +308,9 @@ parseInitiateRequestPdu(MmsServerConnection self, uint8_t* buffer, int bufPos, i
/* we ignore this */ /* we ignore this */
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
break; /* Ignore unknown tags */ break; /* Ignore unknown tags */
} }

11
src/mms/iso_mms/server/mms_file_service.c
Unescape Escape View File

@ -333,6 +333,9 @@ mmsServer_handleFileOpenRequest(
bufPos += length; bufPos += length;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: /* unrecognized parameter */ default: /* unrecognized parameter */
bufPos += length; bufPos += length;
goto exit_reject_invalid_pdu; goto exit_reject_invalid_pdu;
@ -672,6 +675,9 @@ mmsServer_handleObtainFileRequest(
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: /* unrecognized parameter */ default: /* unrecognized parameter */
bufPos += length; bufPos += length;
goto exit_reject_invalid_pdu; goto exit_reject_invalid_pdu;
@ -1095,6 +1101,8 @@ mmsServer_handleFileRenameRequest(
if (DEBUG_MMS_SERVER) if (DEBUG_MMS_SERVER)
printf("MMS_SERVER: newFileName: (%s)\n", newFileName); printf("MMS_SERVER: newFileName: (%s)\n", newFileName);
break;
case 0x00: /* indefinite length end tag -> ignore */
break; break;
default: /* ignore unknown tag */ default: /* ignore unknown tag */
if (DEBUG_MMS_SERVER) if (DEBUG_MMS_SERVER)
@ -1181,6 +1189,9 @@ mmsServer_handleFileDirectoryRequest(
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: /* unrecognized parameter */ default: /* unrecognized parameter */
if (DEBUG_MMS_SERVER) if (DEBUG_MMS_SERVER)
printf("MMS_SERVER: handleFileDirectoryRequest: unrecognized parameter\n"); printf("MMS_SERVER: handleFileDirectoryRequest: unrecognized parameter\n");

6
src/mms/iso_mms/server/mms_get_namelist_service.c
Unescape Escape View File

@ -486,6 +486,8 @@ mmsServer_handleGetNameListRequest(
case 0x82: /* association-specific */ case 0x82: /* association-specific */
objectScope = OBJECT_SCOPE_ASSOCIATION; objectScope = OBJECT_SCOPE_ASSOCIATION;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
mmsMsg_createMmsRejectPdu(&invokeId, MMS_ERROR_REJECT_UNRECOGNIZED_MODIFIER, response); mmsMsg_createMmsRejectPdu(&invokeId, MMS_ERROR_REJECT_UNRECOGNIZED_MODIFIER, response);
return; return;
@ -497,6 +499,10 @@ mmsServer_handleGetNameListRequest(
continueAfter = (char*) (buffer + bufPos); continueAfter = (char*) (buffer + bufPos);
continueAfterLength = length; continueAfterLength = length;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
/* ignore unknown tag */ /* ignore unknown tag */
break; break;

6
src/mms/iso_mms/server/mms_server_connection.c
Unescape Escape View File

@ -387,6 +387,9 @@ handleConfirmedRequestPdu(
break; break;
#endif /* (MMS_GET_DATA_SET_ATTRIBUTES == 1) */ #endif /* (MMS_GET_DATA_SET_ATTRIBUTES == 1) */
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
mmsMsg_createMmsRejectPdu(&invokeId, MMS_ERROR_REJECT_UNRECOGNIZED_SERVICE, response); mmsMsg_createMmsRejectPdu(&invokeId, MMS_ERROR_REJECT_UNRECOGNIZED_SERVICE, response);
return; return;
@ -682,6 +685,9 @@ MmsServerConnection_parseMessage(MmsServerConnection self, ByteBuffer* message,
printf("MMS_SERVER: received reject PDU!\n"); printf("MMS_SERVER: received reject PDU!\n");
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
mmsMsg_createMmsRejectPdu(NULL, MMS_ERROR_REJECT_UNKNOWN_PDU_TYPE, response); mmsMsg_createMmsRejectPdu(NULL, MMS_ERROR_REJECT_UNKNOWN_PDU_TYPE, response);
break; break;

27
src/mms/iso_presentation/iso_presentation.c
Unescape Escape View File

@ -245,6 +245,10 @@ parseFullyEncodedData(IsoPresentation* self, uint8_t* buffer, int len, int bufPo
bufPos += length; bufPos += length;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: fed: unknown tag %02x\n", tag); printf("PRES: fed: unknown tag %02x\n", tag);
@ -289,6 +293,7 @@ parsePCDLEntry(IsoPresentation* self, uint8_t* buffer, int totalLength, int bufP
contextId = BerDecoder_decodeUint32(buffer, len, bufPos); contextId = BerDecoder_decodeUint32(buffer, len, bufPos);
bufPos += len; bufPos += len;
break; break;
case 0x06: /* abstract-syntax-name */ case 0x06: /* abstract-syntax-name */
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: abstract-syntax-name with len %i\n", len); printf("PRES: abstract-syntax-name with len %i\n", len);
@ -305,12 +310,17 @@ parsePCDLEntry(IsoPresentation* self, uint8_t* buffer, int totalLength, int bufP
bufPos += len; bufPos += len;
break; break;
case 0x30: /* transfer-syntax-name */ case 0x30: /* transfer-syntax-name */
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: ignore transfer-syntax-name\n"); printf("PRES: ignore transfer-syntax-name\n");
bufPos += len; bufPos += len;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: unknown tag in presentation-context-definition-list-entry\n"); printf("PRES: unknown tag in presentation-context-definition-list-entry\n");
@ -367,6 +377,8 @@ parsePresentationContextDefinitionList(IsoPresentation* self, uint8_t* buffer, i
if (bufPos < 0) if (bufPos < 0)
return -1; return -1;
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: unknown tag in presentation-context-definition-list\n"); printf("PRES: unknown tag in presentation-context-definition-list\n");
@ -436,6 +448,7 @@ parseNormalModeParameters(IsoPresentation* self, uint8_t* buffer, int totalLengt
printf("PRES: pcd list\n"); printf("PRES: pcd list\n");
bufPos = parsePresentationContextDefinitionList(self, buffer, len, bufPos); bufPos = parsePresentationContextDefinitionList(self, buffer, len, bufPos);
break; break;
case 0x61: /* user data */ case 0x61: /* user data */
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: user-data\n"); printf("PRES: user-data\n");
@ -447,6 +460,9 @@ parseNormalModeParameters(IsoPresentation* self, uint8_t* buffer, int totalLengt
break; break;
case 0x00: /* indefinite length end tag -> ignore */
break;
default: default:
if (DEBUG_PRES) if (DEBUG_PRES)
printf("PRES: unknown tag in normal-mode\n"); printf("PRES: unknown tag in normal-mode\n");
@ -508,6 +524,8 @@ IsoPresentation_parseAcceptMessage(IsoPresentation* self, ByteBuffer* byteBuffer
return 0; return 0;
} }
break;
case 0x00: /* indefinite length end tag -> ignore */
break; break;
default: default:
if (DEBUG_PRES) if (DEBUG_PRES)
@ -634,6 +652,8 @@ IsoPresentation_parseUserData(IsoPresentation* self, ByteBuffer* readBuffer)
int userDataLength; int userDataLength;
uint8_t lengthByte = buffer[bufPos];
bufPos = BerDecoder_decodeLength(buffer, &userDataLength, bufPos, length); bufPos = BerDecoder_decodeLength(buffer, &userDataLength, bufPos, length);
if (bufPos < 0) { if (bufPos < 0) {
@ -642,6 +662,11 @@ IsoPresentation_parseUserData(IsoPresentation* self, ByteBuffer* readBuffer)
return 0; return 0;
} }
if (lengthByte == 0x80) {
/* remove end element from user data length when indefinite length encoded */
userDataLength = userDataLength - 2;
}
ByteBuffer_wrap(&(self->nextPayload), buffer + bufPos, userDataLength, userDataLength); ByteBuffer_wrap(&(self->nextPayload), buffer + bufPos, userDataLength, userDataLength);
return 1; return 1;
@ -721,6 +746,8 @@ IsoPresentation_parseConnect(IsoPresentation* self, ByteBuffer* byteBuffer)
return 0; return 0;
} }
break;
case 0x00: /* indefinite length end tag -> ignore */
break; break;
default: /* unsupported element */ default: /* unsupported element */
if (DEBUG_PRES) if (DEBUG_PRES)

Write Preview
Loading…
Cancel
Save