--- rpl/src/instructions_c4.c 2011/09/26 15:57:12 1.33 +++ rpl/src/instructions_c4.c 2012/03/01 10:14:05 1.38 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.1.4 - Copyright (C) 1989-2011 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.7 + Copyright (C) 1989-2012 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;