Commit 78e3d703 authored by Yann Garcia's avatar Yann Garcia
Browse files

Minor bug fixed

parent 982dcafe

titan-test-system-framework @ 3f542e05

Original line number Diff line number Diff line 
Subproject commit 5babbea3f94b54c322ba8fba42e6b6c6a16270be
 
Subproject commit 3f542e05e054a605c110d0b0b62908057c7203b2

ttcn/Lib_NG_NAS/lib/Lib_NG_NAS_Security_Functions.ttcn

+4 −4
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ module Lib_NG_NAS_Security_Functions { 
                var integer v := oct2int(p_previous_nas_count_dl);

                v := v + 1;

                p_previous_nas_count_dl := int2oct(v, 4);

                p_previous_nas_count_dl := p_previous_nas_count_dl & int2oct(0x00FFFFFF, 4); // Use 24bits only

                p_previous_nas_count_dl := bit2oct(oct2bit(p_previous_nas_count_dl) and4b oct2bit('00FFFFFF'O)); // Use 24bits only

            } else if (v_message.security_Protected_Nas_Message.securityHeaderType == tsc_SHT_IntegrityProtected_Ciphered) {

                // Check integrity

                var octetstring v_SequenceNumber := f_NasSecurity_ExtractSNfromCOUNT(v_message.security_Protected_Nas_Message.messageAuthenticationCode);
@@ -140,7 +140,7 @@ module Lib_NG_NAS_Security_Functions { 
                var integer v := oct2int(p_previous_nas_count_dl);

                v := v + 1;

                p_previous_nas_count_dl := int2oct(v, 4);

                p_previous_nas_count_dl := p_previous_nas_count_dl & int2oct(0x00FFFFFF, 4); // Use 24bits only

                p_previous_nas_count_dl := bit2oct(oct2bit(p_previous_nas_count_dl) and4b oct2bit('00FFFFFF'O)); // Use 24bits only

                // Decyphering

                var octetstring v_cleartextString;

                v_cleartextString := fx_NG_NasDeciphering(v_message.security_Protected_Nas_Message.plainNASMessage,
@@ -226,7 +226,7 @@ module Lib_NG_NAS_Security_Functions { 
                var integer v := oct2int(p_previous_nas_count_ul);

                v := v + 1;

                p_previous_nas_count_ul := int2oct(v, 4);

                p_previous_nas_count_ul := p_previous_nas_count_ul & int2oct(0x00FFFFFF, 4); // Use 24bits only

                p_previous_nas_count_ul := bit2oct(oct2bit(p_previous_nas_count_ul) and4b oct2bit('00FFFFFF'O)); // Use 24bits only

            } else if (v_message.security_Protected_Nas_Message.securityHeaderType == tsc_SHT_IntegrityProtected) {

                // TODO Check integrity

            } else if (v_message.security_Protected_Nas_Message.securityHeaderType == tsc_SHT_IntegrityProtected_Ciphered_NewSecurityContext) {
@@ -251,7 +251,7 @@ module Lib_NG_NAS_Security_Functions { 
                var integer v := oct2int(p_previous_nas_count_ul);

                v := v + 1;

                p_previous_nas_count_ul := int2oct(v, 4);

                p_previous_nas_count_ul := p_previous_nas_count_ul & int2oct(0x00FFFFFF, 4); // Use 24bits only

                p_previous_nas_count_ul := bit2oct(oct2bit(p_previous_nas_count_ul) and4b oct2bit('00FFFFFF'O)); // Use 24bits only

            } else if (v_message.security_Protected_Nas_Message.securityHeaderType == tsc_SHT_IntegrityProtected_Ciphered) {

                // TODO Check integrity

                var octetstring v_cleartextString;