--- rpl/src/instructions_c4.c 2011/06/22 13:26:59 1.27 +++ rpl/src/instructions_c4.c 2011/11/28 21:42:04 1.35 @@ -1,6 +1,6 @@ /* ================================================================================ - RPL/2 (R) version 4.1.0.prerelease.3 + RPL/2 (R) version 4.1.5 Copyright (C) 1989-2011 Dr. BERTRAND Joël This file is part of RPL/2. @@ -478,15 +478,8 @@ instruction_convert(struct_processus *s_ return; } - if (controle(s_etat_processus, executable_candidat, "md5", - rplconvert_md5) != d_vrai) - { - (*s_etat_processus).erreur_systeme = d_es_somme_controle; - return; - } - - if (controle(s_etat_processus, executable_candidat, "sha1", - rplconvert_sha1) != d_vrai) + if (controle_integrite(s_etat_processus, executable_candidat, + "rplconvert") != d_vrai) { (*s_etat_processus).erreur_systeme = d_es_somme_controle; return; @@ -520,15 +513,8 @@ instruction_convert(struct_processus *s_ return; } - if (controle(s_etat_processus, executable_candidat, "md5", - rplconvert_md5) != d_vrai) - { - (*s_etat_processus).erreur_systeme = d_es_somme_controle; - return; - } - - if (controle(s_etat_processus, executable_candidat, "sha1", - rplconvert_sha1) != d_vrai) + if (controle_integrite(s_etat_processus, executable_candidat, + "rplconvert") != d_vrai) { (*s_etat_processus).erreur_systeme = d_es_somme_controle; return;