Commit 11b0b633 authored by garciay's avatar garciay
Browse files

Add a check the value returned by 'f_getMsgSignerInfo' function call

parent 974c2e27

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+28 −15
Original line number Original line Diff line number Diff line
@@ -2349,10 +2349,13 @@ module LibItsGeoNetworking_Functions { 
            var Certificate v_cert;

            var Certificate v_cert;

            alt {

            alt {

                [] a_securedMessageWithCertificate(v_recv){

                [] a_securedMessageWithCertificate(v_recv){

                    var SignerInfo v_si := f_getMsgSignerInfo(v_recv); 

                    var SignerInfo v_si;

                    f_getMsgSignerInfo(v_recv, v_si); 

                    if (isbound(v_si)) {

                        v_cert :=  v_si.signerInfo.certificate

                        v_cert :=  v_si.signerInfo.certificate

                    }

                    }

                }

                }

            }

            return v_cert;

            return v_cert;

        }

        }

        /**

        /**
@@ -2366,10 +2369,13 @@ module LibItsGeoNetworking_Functions { 
            var CertificateChain v_chain;

            var CertificateChain v_chain;

            alt {

            alt {

                [] a_securedMessageWithCertificateChain(v_recv){

                [] a_securedMessageWithCertificateChain(v_recv){

                    var SignerInfo v_si := f_getMsgSignerInfo(v_recv); 

                    var SignerInfo v_si;

                    f_getMsgSignerInfo(v_recv, v_si);

                    if (isbound(v_si)) {

                        v_chain :=  v_si.signerInfo.certificates;

                        v_chain :=  v_si.signerInfo.certificates;

                    }

                    }

                }

                }

            }

            return v_chain;

            return v_chain;

        }

        }

        /**

        /**
@@ -2384,7 +2390,8 @@ module LibItsGeoNetworking_Functions { 
            var SignerInfo     v_si;

            var SignerInfo     v_si;

            alt {

            alt {

                [] a_securedMessageWithCertificate(v_recv){

                [] a_securedMessageWithCertificate(v_recv){

                    v_si := f_getMsgSignerInfo(v_recv);

                    f_getMsgSignerInfo(v_recv, v_si);

                    if (isbound(v_si)) {

                        v_si := f_getCertificateSignerInfo(v_si.signerInfo.certificate);

                        v_si := f_getCertificateSignerInfo(v_si.signerInfo.certificate);

                        if(match (v_si.type_, e_certificate_digest_with_ecdsap256)){

                        if(match (v_si.type_, e_certificate_digest_with_ecdsap256)){

                            f_askForCertificate(v_si.signerInfo.digest);

                            f_askForCertificate(v_si.signerInfo.digest);
@@ -2394,11 +2401,14 @@ module LibItsGeoNetworking_Functions { 
                            repeat;

                            repeat;

                        }

                        }

                    }

                    }

                }

                [] a_securedMessageWithCertificateChain(v_recv){

                [] a_securedMessageWithCertificateChain(v_recv){

                    v_si := f_getMsgSignerInfo(v_recv);

                    f_getMsgSignerInfo(v_recv, v_si);

                    if (isbound(v_si)) {

                        v_chain := v_si.signerInfo.certificates;

                        v_chain := v_si.signerInfo.certificates;

                    } 

                    } 

                }

                }

            }

            return v_chain;

            return v_chain;

        }

        }

        /**

        /**
@@ -2412,10 +2422,13 @@ module LibItsGeoNetworking_Functions { 
            var HashedId8 v_digest;

            var HashedId8 v_digest;

            alt {

            alt {

                [] a_securedMessageWithDigest(v_recv){

                [] a_securedMessageWithDigest(v_recv){

                    var SignerInfo v_si := f_getMsgSignerInfo(v_recv); 

                    var SignerInfo v_si;

                    f_getMsgSignerInfo(v_recv, v_si); 

                    if (isbound(v_si)) {

                        v_digest :=  v_si.signerInfo.digest;

                        v_digest :=  v_si.signerInfo.digest;

                    }

                    }

                }

                }

            }

            return v_digest;

            return v_digest;

        }

        }

    }

    }