--- rpl/src/instructions_r3.c 2011/06/10 11:35:13 1.26 +++ rpl/src/instructions_r3.c 2012/10/01 11:05:06 1.45 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.1.0.prerelease.0 - Copyright (C) 1989-2011 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.11 + Copyright (C) 1989-2012 Dr. BERTRAND Joël This file is part of RPL/2. @@ -1063,15 +1063,8 @@ instruction_recall(struct_processus *s_e return; } - if (controle(s_etat_processus, executable_candidat, "md5", - rpliconv_md5) != d_vrai) - { - (*s_etat_processus).erreur_systeme = d_es_somme_controle; - return; - } - - if (controle(s_etat_processus, executable_candidat, "sha1", - rpliconv_sha1) != d_vrai) + if (controle_integrite(s_etat_processus, executable_candidat, + "rpliconv") != d_vrai) { (*s_etat_processus).erreur_systeme = d_es_somme_controle; return; @@ -1086,15 +1079,8 @@ instruction_recall(struct_processus *s_e return; } - if (controle(s_etat_processus, executable_candidat, "md5", - rplfile_md5) != d_vrai) - { - (*s_etat_processus).erreur_systeme = d_es_somme_controle; - return; - } - - if (controle(s_etat_processus, executable_candidat, "sha1", - rplfile_sha1) != d_vrai) + if (controle_integrite(s_etat_processus, executable_candidat, + "rplfile") != d_vrai) { (*s_etat_processus).erreur_systeme = d_es_somme_controle; return; @@ -1109,15 +1095,8 @@ instruction_recall(struct_processus *s_e return; } - if (controle(s_etat_processus, executable_candidat, "md5", - rplpp_md5) != d_vrai) - { - (*s_etat_processus).erreur_systeme = d_es_somme_controle; - return; - } - - if (controle(s_etat_processus, executable_candidat, "sha1", - rplpp_sha1) != d_vrai) + if (controle_integrite(s_etat_processus, executable_candidat, + "rplpp") != d_vrai) { (*s_etat_processus).erreur_systeme = d_es_somme_controle; return; @@ -1132,15 +1111,8 @@ instruction_recall(struct_processus *s_e return; } - if (controle(s_etat_processus, executable_candidat, "md5", - rplawk_md5) != d_vrai) - { - (*s_etat_processus).erreur_systeme = d_es_somme_controle; - return; - } - - if (controle(s_etat_processus, executable_candidat, "sha1", - rplawk_sha1) != d_vrai) + if (controle_integrite(s_etat_processus, executable_candidat, + "rplawk") != d_vrai) { (*s_etat_processus).erreur_systeme = d_es_somme_controle; return; @@ -1175,15 +1147,8 @@ instruction_recall(struct_processus *s_e return; } - if (controle(s_etat_processus, executable_candidat, "md5", - rpliconv_md5) != d_vrai) - { - (*s_etat_processus).erreur_systeme = d_es_somme_controle; - return; - } - - if (controle(s_etat_processus, executable_candidat, "sha1", - rpliconv_sha1) != d_vrai) + if (controle_integrite(s_etat_processus, executable_candidat, + "rpliconv") != d_vrai) { (*s_etat_processus).erreur_systeme = d_es_somme_controle; return; @@ -1198,15 +1163,8 @@ instruction_recall(struct_processus *s_e return; } - if (controle(s_etat_processus, executable_candidat, "md5", - rplfile_md5) != d_vrai) - { - (*s_etat_processus).erreur_systeme = d_es_somme_controle; - return; - } - - if (controle(s_etat_processus, executable_candidat, "sha1", - rplfile_sha1) != d_vrai) + if (controle_integrite(s_etat_processus, executable_candidat, + "rplfile") != d_vrai) { (*s_etat_processus).erreur_systeme = d_es_somme_controle; return; @@ -1221,15 +1179,8 @@ instruction_recall(struct_processus *s_e return; } - if (controle(s_etat_processus, executable_candidat, "md5", - rplpp_md5) != d_vrai) - { - (*s_etat_processus).erreur_systeme = d_es_somme_controle; - return; - } - - if (controle(s_etat_processus, executable_candidat, "sha1", - rplpp_sha1) != d_vrai) + if (controle_integrite(s_etat_processus, executable_candidat, + "rplpp") != d_vrai) { (*s_etat_processus).erreur_systeme = d_es_somme_controle; return; @@ -1244,15 +1195,8 @@ instruction_recall(struct_processus *s_e return; } - if (controle(s_etat_processus, executable_candidat, "md5", - rplawk_md5) != d_vrai) - { - (*s_etat_processus).erreur_systeme = d_es_somme_controle; - return; - } - - if (controle(s_etat_processus, executable_candidat, "sha1", - rplawk_sha1) != d_vrai) + if (controle_integrite(s_etat_processus, executable_candidat, + "rplawk") != d_vrai) { (*s_etat_processus).erreur_systeme = d_es_somme_controle; return;