mirror of
https://github.com/Martin-P/OpenV2G.git
synced 2024-11-08 12:45:42 +00:00
fix: set fixed size of big integer container
git-svn-id: https://svn.code.sf.net/p/openv2g/code/trunk@113 d9f2db14-54d0-4bde-b00c-16405c910529
This commit is contained in:
parent
5e02082f8b
commit
4109da361b
3 changed files with 5 additions and 4 deletions
|
@ -464,6 +464,7 @@ struct iso1KeyValueType {
|
||||||
|
|
||||||
/* Complex type name='http://www.w3.org/2000/09/xmldsig#,X509IssuerSerialType', base type name='anyType', content type='ELEMENT', isAbstract='false', hasTypeId='false', final='0', block='0', particle='("http://www.w3.org/2000/09/xmldsig#":X509IssuerName,"http://www.w3.org/2000/09/xmldsig#":X509SerialNumber)', derivedBy='RESTRICTION'. */
|
/* Complex type name='http://www.w3.org/2000/09/xmldsig#,X509IssuerSerialType', base type name='anyType', content type='ELEMENT', isAbstract='false', hasTypeId='false', final='0', block='0', particle='("http://www.w3.org/2000/09/xmldsig#":X509IssuerName,"http://www.w3.org/2000/09/xmldsig#":X509SerialNumber)', derivedBy='RESTRICTION'. */
|
||||||
#define iso1X509IssuerSerialType_X509IssuerName_CHARACTERS_SIZE 50 + EXTRA_CHAR
|
#define iso1X509IssuerSerialType_X509IssuerName_CHARACTERS_SIZE 50 + EXTRA_CHAR
|
||||||
|
#define iso1X509IssuerSerialType_X509SerialNumber_BYTES_SIZE 20
|
||||||
uint8_t characters[20];
|
uint8_t characters[20];
|
||||||
struct iso1X509IssuerSerialType {
|
struct iso1X509IssuerSerialType {
|
||||||
/* element: "http://www.w3.org/2000/09/xmldsig#":X509IssuerName, http://www.w3.org/2001/XMLSchema,string */
|
/* element: "http://www.w3.org/2000/09/xmldsig#":X509IssuerName, http://www.w3.org/2001/XMLSchema,string */
|
||||||
|
@ -477,11 +478,11 @@ struct iso1X509IssuerSerialType {
|
||||||
/** a sign value */
|
/** a sign value */
|
||||||
int negative;
|
int negative;
|
||||||
/* container size */
|
/* container size */
|
||||||
size_t size;
|
/* size_t size; iso1X509IssuerSerialType_X509SerialNumber_BYTES_SIZE */
|
||||||
/** array data container */
|
/** array data container */
|
||||||
/* For negative values, the Unsigned Integer holds the
|
/* For negative values, the Unsigned Integer holds the
|
||||||
* magnitude of the value minus 1 */
|
* magnitude of the value minus 1 */
|
||||||
uint8_t* data;
|
uint8_t data[iso1X509IssuerSerialType_X509SerialNumber_BYTES_SIZE];
|
||||||
/** array length (len <= size) */
|
/** array length (len <= size) */
|
||||||
size_t len;
|
size_t len;
|
||||||
} X509SerialNumber;
|
} X509SerialNumber;
|
||||||
|
|
|
@ -8060,7 +8060,7 @@ static int decode_iso1X509IssuerSerialType(bitstream_t* stream, struct iso1X509I
|
||||||
errn = decodeNBitUnsignedInteger(stream, 1, &eventCode);
|
errn = decodeNBitUnsignedInteger(stream, 1, &eventCode);
|
||||||
if(errn == 0) {
|
if(errn == 0) {
|
||||||
if(eventCode == 0) {
|
if(eventCode == 0) {
|
||||||
errn = decodeIntegerBig(stream, &iso1X509IssuerSerialType->X509SerialNumber.negative, iso1X509IssuerSerialType->X509SerialNumber.size, iso1X509IssuerSerialType->X509SerialNumber.data, &iso1X509IssuerSerialType->X509SerialNumber.len);
|
errn = decodeIntegerBig(stream, &iso1X509IssuerSerialType->X509SerialNumber.negative, iso1X509IssuerSerialType_X509SerialNumber_BYTES_SIZE, iso1X509IssuerSerialType->X509SerialNumber.data, &iso1X509IssuerSerialType->X509SerialNumber.len);
|
||||||
} else {
|
} else {
|
||||||
/* Second level event (e.g., xsi:type, xsi:nil, ...) */
|
/* Second level event (e.g., xsi:type, xsi:nil, ...) */
|
||||||
errn = EXI_UNSUPPORTED_EVENT_CODE_CHARACTERISTICS;
|
errn = EXI_UNSUPPORTED_EVENT_CODE_CHARACTERISTICS;
|
||||||
|
|
|
@ -5815,7 +5815,7 @@ static int encode_iso1X509IssuerSerialType(bitstream_t* stream, struct iso1X509I
|
||||||
errn = encodeNBitUnsignedInteger(stream, 1, 0);
|
errn = encodeNBitUnsignedInteger(stream, 1, 0);
|
||||||
if(errn == 0) {
|
if(errn == 0) {
|
||||||
/* errn = encodeInteger64(stream, iso1X509IssuerSerialType->X509SerialNumber); */
|
/* errn = encodeInteger64(stream, iso1X509IssuerSerialType->X509SerialNumber); */
|
||||||
errn = encodeIntegerBig(stream, iso1X509IssuerSerialType->X509SerialNumber.negative, iso1X509IssuerSerialType->X509SerialNumber.size, iso1X509IssuerSerialType->X509SerialNumber.data, iso1X509IssuerSerialType->X509SerialNumber.len);
|
errn = encodeIntegerBig(stream, iso1X509IssuerSerialType->X509SerialNumber.negative, iso1X509IssuerSerialType_X509SerialNumber_BYTES_SIZE, iso1X509IssuerSerialType->X509SerialNumber.data, iso1X509IssuerSerialType->X509SerialNumber.len);
|
||||||
/* valid EE */
|
/* valid EE */
|
||||||
errn = encodeNBitUnsignedInteger(stream, 1, 0);
|
errn = encodeNBitUnsignedInteger(stream, 1, 0);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue