Commit 9b8f9548 authored by garciay's avatar garciay
Browse files

Validate codec on TCT3

parent 546b46a8
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ module LibItsSecurity_Functions {
                    k := 0; // index for v_headerFields
                        
                    // Special processing for signer_info
                    if (lengthof(valueof(p_headerFields)) > 0 and valueof(p_headerFields[i]).type_ == e_signer_info) {
                    if (lengthof(valueof(p_headerFields)) > 0 and valueof(p_headerFields[i].type_) == e_signer_info) {
                        v_headerFields[k] := valueof(p_headerFields[i]);
                        k := k + 1;
                        i := i + 1;
@@ -224,15 +224,15 @@ module LibItsSecurity_Functions {
                    for (j := j; j < lengthof(p_mandatoryHeaders); j := j + 1) {
                        // Search for mandatory header in p_HeaderFields
                        for (n := 0; n < lengthof(p_headerFields); n := n + 1) {
                            if (valueof(p_headerFields[n]).type_ == valueof(p_mandatoryHeaders[j]).type_) {
                            if (valueof(p_headerFields[n].type_) == valueof(p_mandatoryHeaders[j].type_)) {
                                // mandatory header already in p_HeaderFields
                                break;
                            }
                        } // End of 'for' statement
                        if (n >= lengthof(p_headerFields)) {
                            if (valueof(p_mandatoryHeaders[j]).type_ != e_signer_info) {
                            if (valueof(p_mandatoryHeaders[j].type_) != e_signer_info) {
                                // Add headers from p_headerFields having lower number than mandatory header
                                for (n := i; n < lengthof(p_headerFields) and valueof(p_headerFields[n]).type_ < valueof(p_mandatoryHeaders[j]).type_; n:=n+1) {
                                for (n := i; n < lengthof(p_headerFields) and valueof(p_headerFields[n].type_) < valueof(p_mandatoryHeaders[j].type_); n := n + 1) {
                                    v_headerFields[k] := valueof(p_headerFields[n]);
                                    k := k + 1;
                                    i := i + 1;
@@ -255,8 +255,8 @@ module LibItsSecurity_Functions {
                
                // Prepare payload to be signed
                if (
                    (valueof(p_payloadField).type_ == e_signed) or 
                    (valueof(p_payloadField).type_ == e_signed_and_encrypted
                    (valueof(p_payloadField.type_) == e_signed) or 
                    (valueof(p_payloadField.type_) == e_signed_and_encrypted
                )) {
                    v_toBeSignedPayload := valueof(p_payloadField);
                } // TODO else, check draft