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

Generate new certificate,

Bug fixed in AT certificate description
parent c103dcf1
Loading
Loading
Loading
Loading
+4 −13
Original line number Original line Diff line number Diff line
@@ -66,10 +66,10 @@ module LibItsSecurity_Functions {
                                                     in octetstring p_ecdsaNistp256PublicKeyX, 
                                                     in octetstring p_ecdsaNistp256PublicKeyX, 
                                                     in octetstring p_ecdsaNistp256PublicKeyY
                                                     in octetstring p_ecdsaNistp256PublicKeyY
        ) return boolean {
        ) return boolean {
            log("p_toBeVerifiedData=        ", p_toBeVerifiedData);
//            log("p_toBeVerifiedData=        ", p_toBeVerifiedData);
            log("p_signature=               ", p_signature);
//            log("p_signature=               ", p_signature);
            log("p_ecdsaNistp256PublicKeyX= ", p_ecdsaNistp256PublicKeyX);
//            log("p_ecdsaNistp256PublicKeyX= ", p_ecdsaNistp256PublicKeyX);
            log("p_ecdsaNistp256PublicKeyY= ", p_ecdsaNistp256PublicKeyY);
//            log("p_ecdsaNistp256PublicKeyY= ", p_ecdsaNistp256PublicKeyY);
            return fx_verifyWithEcdsaNistp256WithSha256(
            return fx_verifyWithEcdsaNistp256WithSha256(
                p_toBeVerifiedData, 
                p_toBeVerifiedData, 
                p_signature, 
                p_signature, 
@@ -415,25 +415,17 @@ module LibItsSecurity_Functions {
                var boolean v_result := false;
                var boolean v_result := false;
                var template (value) ToBeSignedCertificate v_toBeSignedCertificate;
                var template (value) ToBeSignedCertificate v_toBeSignedCertificate;
                
                
                log("p_certificateToBeVerified: ", p_certificateToBeVerified);
                log("full certificate: ", bit2oct(encvalue(p_certificateToBeVerified)));
                
                // Create Certificate payload to be verified
                // Create Certificate payload to be verified
                v_toBeSignedCertificate := m_toBeSignedCertificate(p_certificateToBeVerified);
                v_toBeSignedCertificate := m_toBeSignedCertificate(p_certificateToBeVerified);
                log("v_toBeSignedCertificate=", v_toBeSignedCertificate);
                toBeVerifiedData := bit2oct(encvalue(v_toBeSignedCertificate));
                toBeVerifiedData := bit2oct(encvalue(v_toBeSignedCertificate));
                log("toBeVerifiedData=", toBeVerifiedData);
                
                
                // Build the signature
                // Build the signature
                v_signature := 
                v_signature := 
                    '0000'O & 
                    '0000'O & 
                    valueof(p_certificateToBeVerified.signature_.signature_.ecdsa_signature.r.x) & 
                    valueof(p_certificateToBeVerified.signature_.signature_.ecdsa_signature.r.x) & 
                    valueof(p_certificateToBeVerified.signature_.signature_.ecdsa_signature.s);
                    valueof(p_certificateToBeVerified.signature_.signature_.ecdsa_signature.s);
                log("v_signature=", v_signature);
                
                
                // Verify the certificate
                // Verify the certificate
                log("p_publicKey.public_key.eccPoint.x", p_publicKey.public_key.eccPoint.x);
                log("p_publicKey.public_key.eccPoint.y.y", p_publicKey.public_key.eccPoint.y.y);
                v_result := f_verifyWithEcdsaNistp256WithSha256(
                v_result := f_verifyWithEcdsaNistp256WithSha256(
                    toBeVerifiedData,
                    toBeVerifiedData,
                    v_signature,
                    v_signature,
@@ -441,7 +433,6 @@ module LibItsSecurity_Functions {
                    valueof(p_publicKey.public_key.eccPoint.y.y)
                    valueof(p_publicKey.public_key.eccPoint.y.y)
                );
                );
                
                
                log("f_verifyCertificateSignatureWithPublicKey: ", v_result);
                return v_result;
                return v_result;
            } // End of finction f_verifyCertificateSignatureWithPublicKey
            } // End of finction f_verifyCertificateSignatureWithPublicKey
            
            
+12 −6
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ module LibItsSecurity_Pixits {
            },
            },
            validity_restrictions   := {
            validity_restrictions   := {
                valueof(m_validity_restriction_time_start_and_end(
                valueof(m_validity_restriction_time_start_and_end(
                    1408802285,
                    1409320685,
                    1513691885
                    1513691885
                )),
                )),
                valueof(m_validity_restriction_region(
                valueof(m_validity_restriction_region(
@@ -150,7 +150,7 @@ module LibItsSecurity_Pixits {
            },
            },
            validity_restrictions   := {
            validity_restrictions   := {
                valueof(m_validity_restriction_time_start_and_end(
                valueof(m_validity_restriction_time_start_and_end(
                    1408802285,
                    1409320685,
                    1513691885
                    1513691885
                )),
                )),
                valueof(m_validity_restriction_region(
                valueof(m_validity_restriction_region(
@@ -224,16 +224,22 @@ module LibItsSecurity_Pixits {
                        '00'B
                        '00'B
                    )
                    )
                )),
                )),
                valueof(m_subject_attribute_its_aid_list(
                valueof(m_subject_attribute_its_aid_ssp_list(
                    { 
                        {
                        {
                            16512,
                            16512,
                        16513
                            '00'O
                        },
                        {
                            16513,
                            '00'O
                        }
                    }
                    }
                ))
                ))
            },
            },
            validity_restrictions   := {
            validity_restrictions   := {
                valueof(m_validity_restriction_time_start_and_end(
                valueof(m_validity_restriction_time_start_and_end(
                    1408802285,
                    1409320685,
                    1513691885
                    1513691885
                )),
                )),
                valueof(m_validity_restriction_region(
                valueof(m_validity_restriction_region(