--- rpl/src/instructions_r3.c	2011/11/26 10:01:30	1.37
+++ rpl/src/instructions_r3.c	2011/11/28 21:42:04	1.38
@@ -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;