Loading ePassport/ttcn/ePassport_Functions.ttcn +8 −9 Original line number Diff line number Diff line Loading @@ -392,6 +392,7 @@ var octetstring v_f, v_h; var octetstring v_trailer; var integer v_m1Length; var octetstring v_aaPrivateKey; // TODO: determine algorithm used by DG15 // if RSA get modulus.length Loading Loading @@ -421,7 +422,8 @@ //FIXME // encrypt message representative return f_encrypt(e_rsa, vc_simu.aaPrivateKey, v_f); //FIXME Algorithm! f_readFileData(c_filePrAA, 0, -1, v_aaPrivateKey); return f_encrypt(e_rsa, v_aaPrivateKey, v_f); //FIXME Algorithm! } function f_chipAuthentication(in octetstring p_publicKeyPcd) runs on MRTD { Loading @@ -429,10 +431,12 @@ var octetstring v_k; var octetstring v_h; var octetstring v_dg14; var octetstring v_dhPrivateKey; // a) The shared secret K = KA(SKPICC;^PKPCD;DPICC) = KA(^SKPCD;PKPICC;DPICC) v_dg14 := f_readFileData(c_fileDG14, 0, -1, v_dg14); v_k := f_computeSharedSecret(vc_simu.dhPrivateKey, v_dg14, p_publicKeyPcd); f_readFileData(c_fileDG14, 0, -1, v_dg14); f_readFileData(c_fileDG14, 0, -1, v_dhPrivateKey); v_k := f_computeSharedSecret(v_dhPrivateKey, v_dg14, p_publicKeyPcd); // b) The session keys KMAC and KEnc derived from K for Secure Messaging. f_deriveKeys(v_k, vc_simu.kEnc, vc_simu.kMac); Loading Loading @@ -509,11 +513,6 @@ // FIXME: Force initialization of vc_simu.securityStatus vc_simu.passportProtection := e_bac; // Prepare Active Authentication private key // FIXME: temporarily disabled // TODO: read only if necessary //f_readFileData(c_filePrAA, 0, -1, vc_simu.aaPrivateKey); } // end f_initializeMRTD Loading ePassport/ttcn/ePassport_TestSystem.ttcn +0 −2 Original line number Diff line number Diff line Loading @@ -53,8 +53,6 @@ module ePassport_TestSystem { FileSet currentFiles, octetstring kEnc, octetstring kMac, octetstring dhPrivateKey optional, // DH Private Key - Chip Authentication octetstring aaPrivateKey optional, // KPrAA - Active Authentication ChrList trustedCAs optional, // list of trusted CAs - derived from EF.CVCA CertList trustedCertificates optional, // list of trusted certificates Loading Loading
ePassport/ttcn/ePassport_Functions.ttcn +8 −9 Original line number Diff line number Diff line Loading @@ -392,6 +392,7 @@ var octetstring v_f, v_h; var octetstring v_trailer; var integer v_m1Length; var octetstring v_aaPrivateKey; // TODO: determine algorithm used by DG15 // if RSA get modulus.length Loading Loading @@ -421,7 +422,8 @@ //FIXME // encrypt message representative return f_encrypt(e_rsa, vc_simu.aaPrivateKey, v_f); //FIXME Algorithm! f_readFileData(c_filePrAA, 0, -1, v_aaPrivateKey); return f_encrypt(e_rsa, v_aaPrivateKey, v_f); //FIXME Algorithm! } function f_chipAuthentication(in octetstring p_publicKeyPcd) runs on MRTD { Loading @@ -429,10 +431,12 @@ var octetstring v_k; var octetstring v_h; var octetstring v_dg14; var octetstring v_dhPrivateKey; // a) The shared secret K = KA(SKPICC;^PKPCD;DPICC) = KA(^SKPCD;PKPICC;DPICC) v_dg14 := f_readFileData(c_fileDG14, 0, -1, v_dg14); v_k := f_computeSharedSecret(vc_simu.dhPrivateKey, v_dg14, p_publicKeyPcd); f_readFileData(c_fileDG14, 0, -1, v_dg14); f_readFileData(c_fileDG14, 0, -1, v_dhPrivateKey); v_k := f_computeSharedSecret(v_dhPrivateKey, v_dg14, p_publicKeyPcd); // b) The session keys KMAC and KEnc derived from K for Secure Messaging. f_deriveKeys(v_k, vc_simu.kEnc, vc_simu.kMac); Loading Loading @@ -509,11 +513,6 @@ // FIXME: Force initialization of vc_simu.securityStatus vc_simu.passportProtection := e_bac; // Prepare Active Authentication private key // FIXME: temporarily disabled // TODO: read only if necessary //f_readFileData(c_filePrAA, 0, -1, vc_simu.aaPrivateKey); } // end f_initializeMRTD Loading
ePassport/ttcn/ePassport_TestSystem.ttcn +0 −2 Original line number Diff line number Diff line Loading @@ -53,8 +53,6 @@ module ePassport_TestSystem { FileSet currentFiles, octetstring kEnc, octetstring kMac, octetstring dhPrivateKey optional, // DH Private Key - Chip Authentication octetstring aaPrivateKey optional, // KPrAA - Active Authentication ChrList trustedCAs optional, // list of trusted CAs - derived from EF.CVCA CertList trustedCertificates optional, // list of trusted certificates Loading