rpl/src/instructions_d6.c - diff

Return to instructions_d6.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_d6.c between versions 1.41 and 1.42

version 1.41, 2013/02/25 11:24:02	version 1.42, 2013/02/25 19:14:01
Line 607 instruction_digest(struct_processus *s_e	Line 607 instruction_digest(struct_processus *s_e
{	{
EVP_MD_CTX contexte;	EVP_MD_CTX contexte;

const EVP_MD * (*EVP_sum)();	const EVP_MD *EVP_sum;
	const EVP_CIPHER *EVP_chiffrement;

logical1 somme_invalide;	logical1 somme_invalide;

Line 625 instruction_digest(struct_processus *s_e	Line 626 instruction_digest(struct_processus *s_e
unsigned char *fonction;	unsigned char *fonction;
unsigned char somme[EVP_MAX_MD_SIZE];	unsigned char somme[EVP_MAX_MD_SIZE];
unsigned char *tampon;	unsigned char *tampon;
	unsigned char *vecteur_initialisation;

unsigned int longueur_bloc;	unsigned int longueur_bloc;
unsigned int longueur_somme;	unsigned int longueur_somme;
unsigned int longueur_tampon;	unsigned int longueur_tampon;

unsigned long longueur_clef;	unsigned long longueur_clef;
	unsigned long longueur_clef_attendue;

(*s_etat_processus).erreur_execution = d_ex;	(*s_etat_processus).erreur_execution = d_ex;

Line 664 instruction_digest(struct_processus *s_e	Line 667 instruction_digest(struct_processus *s_e
printf(" Algorithms:\n\n");	printf(" Algorithms:\n\n");
}	}

	# ifndef OPENSSL_NO_AES
	printf(" - AES-128-CBC\n");
	printf(" - AES-192-CBC\n");
	printf(" - AES-256-CBC\n");
	# endif
# ifndef OPENSSL_NO_SHA	# ifndef OPENSSL_NO_SHA
printf(" - DSS\n");	printf(" - DSS\n");
printf(" - DSS1\n");	printf(" - DSS1\n");
Line 713 instruction_digest(struct_processus *s_e	Line 721 instruction_digest(struct_processus *s_e

printf(" \"text\" \"MD5\" DIGEST\n");	printf(" \"text\" \"MD5\" DIGEST\n");
printf(" \"text\" { \"SHA384\" \"key\" } DIGEST\n");	printf(" \"text\" { \"SHA384\" \"key\" } DIGEST\n");
printf(" \"text\" { \"AES-CBC\" \"key\" } DIGEST\n");	printf(" \"text\" { \"AES-128-CBC\" \"key\" } DIGEST\n");
return;	return;
}	}
else if ((*s_etat_processus).test_instruction == 'Y')	else if ((*s_etat_processus).test_instruction == 'Y')
Line 792 instruction_digest(struct_processus *s_e	Line 800 instruction_digest(struct_processus *s_e
{	{
case d_code_fin_chaine:	case d_code_fin_chaine:
{	{
EVP_sum = EVP_dss;	EVP_sum = EVP_dss();
break;	break;
}	}

Line 800 instruction_digest(struct_processus *s_e	Line 808 instruction_digest(struct_processus *s_e
{	{
if (fonction[4] == d_code_fin_chaine)	if (fonction[4] == d_code_fin_chaine)
{	{
EVP_sum = EVP_dss1;	EVP_sum = EVP_dss1();
}	}
else	else
{	{
Line 863 instruction_digest(struct_processus *s_e	Line 871 instruction_digest(struct_processus *s_e
if (fonction[5] ==	if (fonction[5] ==
d_code_fin_chaine)	d_code_fin_chaine)
{	{
EVP_sum = EVP_ecdsa;	EVP_sum = EVP_ecdsa();
}	}
else	else
{	{
Line 927 instruction_digest(struct_processus *s_e	Line 935 instruction_digest(struct_processus *s_e
{	{
if (fonction[3] == d_code_fin_chaine)	if (fonction[3] == d_code_fin_chaine)
{	{
EVP_sum = EVP_md2;	EVP_sum = EVP_md2();
}	}
else	else
{	{
Line 943 instruction_digest(struct_processus *s_e	Line 951 instruction_digest(struct_processus *s_e
{	{
if (fonction[3] == d_code_fin_chaine)	if (fonction[3] == d_code_fin_chaine)
{	{
EVP_sum = EVP_md4;	EVP_sum = EVP_md4();
}	}
else	else
{	{
Line 959 instruction_digest(struct_processus *s_e	Line 967 instruction_digest(struct_processus *s_e
{	{
if (fonction[3] == d_code_fin_chaine)	if (fonction[3] == d_code_fin_chaine)
{	{
EVP_sum = EVP_md5;	EVP_sum = EVP_md5();
}	}
else	else
{	{
Line 979 instruction_digest(struct_processus *s_e	Line 987 instruction_digest(struct_processus *s_e
{	{
if (fonction[4] == d_code_fin_chaine)	if (fonction[4] == d_code_fin_chaine)
{	{
EVP_sum = EVP_mdc2;	EVP_sum = EVP_mdc2();
}	}
else	else
{	{
Line 1025 instruction_digest(struct_processus *s_e	Line 1033 instruction_digest(struct_processus *s_e
{	{
if (strcmp(fonction, "RIPEMD160") == 0)	if (strcmp(fonction, "RIPEMD160") == 0)
{	{
EVP_sum = EVP_ripemd160;	EVP_sum = EVP_ripemd160();
}	}
else	else
{	{
Line 1051 instruction_digest(struct_processus *s_e	Line 1059 instruction_digest(struct_processus *s_e
{	{
case d_code_fin_chaine:	case d_code_fin_chaine:
{	{
EVP_sum = EVP_sha;	EVP_sum = EVP_sha();
break;	break;
}	}

Line 1059 instruction_digest(struct_processus *s_e	Line 1067 instruction_digest(struct_processus *s_e
{	{
if (fonction[4] == d_code_fin_chaine)	if (fonction[4] == d_code_fin_chaine)
{	{
EVP_sum = EVP_sha1;	EVP_sum = EVP_sha1();
}	}
else	else
{	{
Line 1084 instruction_digest(struct_processus *s_e	Line 1092 instruction_digest(struct_processus *s_e
d_code_fin_chaine)	d_code_fin_chaine)
{	{
EVP_sum =	EVP_sum =
EVP_sha224;	EVP_sha224();
}	}
else	else
{	{
somme_invalide =	somme_invalide =
d_vrai;	d_vrai;
}	}

break;	break;
Line 1115 instruction_digest(struct_processus *s_e	Line 1123 instruction_digest(struct_processus *s_e
d_code_fin_chaine)	d_code_fin_chaine)
{	{
EVP_sum =	EVP_sum =
EVP_sha256;	EVP_sha256();
}	}
else	else
{	{
somme_invalide =	somme_invalide =
d_vrai;	d_vrai;
}	}

break;	break;
Line 1162 instruction_digest(struct_processus *s_e	Line 1170 instruction_digest(struct_processus *s_e
d_code_fin_chaine)	d_code_fin_chaine)
{	{
EVP_sum =	EVP_sum =
EVP_sha384;	EVP_sha384();
}	}
else	else
{	{
somme_invalide =	somme_invalide =
d_vrai;	d_vrai;
}	}

break;	break;
Line 1207 instruction_digest(struct_processus *s_e	Line 1215 instruction_digest(struct_processus *s_e
d_code_fin_chaine)	d_code_fin_chaine)
{	{
EVP_sum =	EVP_sum =
EVP_sha512;	EVP_sha512();
}	}
else	else
{	{
somme_invalide =	somme_invalide =
d_vrai;	d_vrai;
}	}

break;	break;
Line 1275 instruction_digest(struct_processus *s_e	Line 1283 instruction_digest(struct_processus *s_e
{	{
if (strcmp(fonction, "WHIRLPOOL") == 0)	if (strcmp(fonction, "WHIRLPOOL") == 0)
{	{
EVP_sum = EVP_whirlpool;	EVP_sum = EVP_whirlpool();
}	}
else	else
{	{
Line 1305 instruction_digest(struct_processus *s_e	Line 1313 instruction_digest(struct_processus *s_e
return;	return;
}	}

if (EVP_DigestInit(&contexte, EVP_sum()) != 1)	if (EVP_DigestInit(&contexte, EVP_sum) != 1)
{	{
EVP_MD_CTX_cleanup(&contexte);	EVP_MD_CTX_cleanup(&contexte);

Line 1444 instruction_digest(struct_processus *s_e	Line 1452 instruction_digest(struct_processus *s_e
{	{
case d_code_fin_chaine:	case d_code_fin_chaine:
{	{
EVP_sum = EVP_dss;	EVP_sum = EVP_dss();
longueur_bloc = SHA_CBLOCK;	longueur_bloc = SHA_CBLOCK;
break;	break;
}	}
Line 1453 instruction_digest(struct_processus *s_e	Line 1461 instruction_digest(struct_processus *s_e
{	{
if (fonction[4] == d_code_fin_chaine)	if (fonction[4] == d_code_fin_chaine)
{	{
EVP_sum = EVP_dss1;	EVP_sum = EVP_dss1();
longueur_bloc = SHA_CBLOCK;	longueur_bloc = SHA_CBLOCK;
}	}
else	else
Line 1517 instruction_digest(struct_processus *s_e	Line 1525 instruction_digest(struct_processus *s_e
if (fonction[5] ==	if (fonction[5] ==
d_code_fin_chaine)	d_code_fin_chaine)
{	{
EVP_sum = EVP_ecdsa;	EVP_sum = EVP_ecdsa();
longueur_bloc = SHA_CBLOCK;	longueur_bloc = SHA_CBLOCK;
}	}
else	else
Line 1582 instruction_digest(struct_processus *s_e	Line 1590 instruction_digest(struct_processus *s_e
{	{
if (fonction[3] == d_code_fin_chaine)	if (fonction[3] == d_code_fin_chaine)
{	{
EVP_sum = EVP_md2;	EVP_sum = EVP_md2();
longueur_bloc = MD2_BLOCK;	longueur_bloc = MD2_BLOCK;
}	}
else	else
Line 1599 instruction_digest(struct_processus *s_e	Line 1607 instruction_digest(struct_processus *s_e
{	{
if (fonction[3] == d_code_fin_chaine)	if (fonction[3] == d_code_fin_chaine)
{	{
EVP_sum = EVP_md4;	EVP_sum = EVP_md4();
longueur_bloc = MD4_CBLOCK;	longueur_bloc = MD4_CBLOCK;
}	}
else	else
Line 1616 instruction_digest(struct_processus *s_e	Line 1624 instruction_digest(struct_processus *s_e
{	{
if (fonction[3] == d_code_fin_chaine)	if (fonction[3] == d_code_fin_chaine)
{	{
EVP_sum = EVP_md5;	EVP_sum = EVP_md5();
longueur_bloc = MD5_CBLOCK;	longueur_bloc = MD5_CBLOCK;
}	}
else	else
Line 1637 instruction_digest(struct_processus *s_e	Line 1645 instruction_digest(struct_processus *s_e
{	{
if (fonction[4] == d_code_fin_chaine)	if (fonction[4] == d_code_fin_chaine)
{	{
EVP_sum = EVP_mdc2;	EVP_sum = EVP_mdc2();
longueur_bloc = MDC2_BLOCK;	longueur_bloc = MDC2_BLOCK;
}	}
else	else
Line 1684 instruction_digest(struct_processus *s_e	Line 1692 instruction_digest(struct_processus *s_e
{	{
if (strcmp(fonction, "RIPEMD160") == 0)	if (strcmp(fonction, "RIPEMD160") == 0)
{	{
EVP_sum = EVP_ripemd160;	EVP_sum = EVP_ripemd160();
longueur_bloc = RIPEMD160_CBLOCK;	longueur_bloc = RIPEMD160_CBLOCK;
}	}
else	else
Line 1711 instruction_digest(struct_processus *s_e	Line 1719 instruction_digest(struct_processus *s_e
{	{
case d_code_fin_chaine:	case d_code_fin_chaine:
{	{
EVP_sum = EVP_sha;	EVP_sum = EVP_sha();
longueur_bloc = SHA_CBLOCK;	longueur_bloc = SHA_CBLOCK;
break;	break;
}	}
Line 1720 instruction_digest(struct_processus *s_e	Line 1728 instruction_digest(struct_processus *s_e
{	{
if (fonction[4] == d_code_fin_chaine)	if (fonction[4] == d_code_fin_chaine)
{	{
EVP_sum = EVP_sha1;	EVP_sum = EVP_sha1();
longueur_bloc = SHA_CBLOCK;	longueur_bloc = SHA_CBLOCK;
}	}
else	else
Line 1746 instruction_digest(struct_processus *s_e	Line 1754 instruction_digest(struct_processus *s_e
d_code_fin_chaine)	d_code_fin_chaine)
{	{
EVP_sum =	EVP_sum =
EVP_sha224;	EVP_sha224();
longueur_bloc =	longueur_bloc =
SHA256_CBLOCK;	SHA256_CBLOCK;
}	}
Line 1779 instruction_digest(struct_processus *s_e	Line 1787 instruction_digest(struct_processus *s_e
d_code_fin_chaine)	d_code_fin_chaine)
{	{
EVP_sum =	EVP_sum =
EVP_sha256;	EVP_sha256();
longueur_bloc =	longueur_bloc =
SHA256_CBLOCK;	SHA256_CBLOCK;
}	}
Line 1828 instruction_digest(struct_processus *s_e	Line 1836 instruction_digest(struct_processus *s_e
d_code_fin_chaine)	d_code_fin_chaine)
{	{
EVP_sum =	EVP_sum =
EVP_sha384;	EVP_sha384();
longueur_bloc =	longueur_bloc =
SHA512_CBLOCK;	SHA512_CBLOCK;
}	}
Line 1875 instruction_digest(struct_processus *s_e	Line 1883 instruction_digest(struct_processus *s_e
d_code_fin_chaine)	d_code_fin_chaine)
{	{
EVP_sum =	EVP_sum =
EVP_sha512;	EVP_sha512();
longueur_bloc =	longueur_bloc =
SHA512_CBLOCK;	SHA512_CBLOCK;
}	}
Line 1945 instruction_digest(struct_processus *s_e	Line 1953 instruction_digest(struct_processus *s_e
{	{
if (strcmp(fonction, "WHIRLPOOL") == 0)	if (strcmp(fonction, "WHIRLPOOL") == 0)
{	{
EVP_sum = EVP_whirlpool;	EVP_sum = EVP_whirlpool();
longueur_bloc = WHIRLPOOL_BBLOCK / 8;	longueur_bloc = WHIRLPOOL_BBLOCK / 8;
}	}
else	else
Line 1964 instruction_digest(struct_processus *s_e	Line 1972 instruction_digest(struct_processus *s_e
}	}
}	}

free(fonction);

if (somme_invalide == d_vrai)	if (somme_invalide == d_vrai)
{	{
// Le chiffrement est de type CBC-MAC	// Le chiffrement est de type CBC-MAC
BUG(1, uprintf("Oops!"));
exit(0);	/*
	* const EVP_CIPHER *EVP_des_cbc(void);
	* const EVP_CIPHER *EVP_des_ede_cbc(void);
	* const EVP_CIPHER *EVP_des_ede3_cbc(void);
	* const EVP_CIPHER *EVP_desx_cbc(void);
	* const EVP_CIPHER *EVP_dev_crypto_des_ede3_cbc(void);
	* const EVP_CIPHER *EVP_idea_cbc(void);
	* const EVP_CIPHER *EVP_rc2_cbc(void);
	* const EVP_CIPHER *EVP_rc2_40_cbc(void);
	* const EVP_CIPHER *EVP_rc2_64_cbc(void);
	* const EVP_CIPHER *EVP_bf_cbc(void);
	* const EVP_CIPHER *EVP_cast5_cbc(void);
	* const EVP_CIPHER *EVP_rc5_32_12_16_cbc(void);
	* const EVP_CIPHER *EVP_aes_128_cbc(void);
	* const EVP_CIPHER *EVP_aes_192_cbc(void);
	* const EVP_CIPHER *EVP_aes_256_cbc(void);
	* const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha1(void);
	* const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha1(void);
	* const EVP_CIPHER *EVP_camellia_128_cbc(void);
	* const EVP_CIPHER *EVP_camellia_192_cbc(void);
	* const EVP_CIPHER *EVP_camellia_256_cbc(void);
	* const EVP_CIPHER *EVP_seed_cbc(void);
	*/

	if (strncmp(fonction, "AES", 3) == 0)
	{
	# ifdef OPENSSL_NO_AES
	free(fonction);

	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);

	(*s_etat_processus).erreur_execution =
	d_ex_chiffrement_indisponible;
	# else

	if (strcmp(fonction, "AES-128-CBC") == 0)
	{
	EVP_chiffrement = EVP_aes_128_cbc();
	longueur_clef_attendue = 16;
	longueur_somme = AES_BLOCK_SIZE;
	}
	else if (strcmp(fonction, "AES-192-CBC") == 0)
	{
	EVP_chiffrement = EVP_aes_192_cbc();
	longueur_clef_attendue = 24;
	longueur_somme = AES_BLOCK_SIZE;
	}
	else if (strcmp(fonction, "AES-256-CBC") == 0)
	{
	EVP_chiffrement = EVP_aes_256_cbc();
	longueur_clef_attendue = 32;
	longueur_somme = AES_BLOCK_SIZE;
	}
	else
	{
	free(fonction);

	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);

	(*s_etat_processus).erreur_execution =
	d_ex_chiffrement_indisponible;
	return;
	}

	if ((chaine = formateur_flux(s_etat_processus, (unsigned char *)
	(*s_objet_argument_2).objet, &longueur_chaine)) == NULL)
	{
	free(fonction);

	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);

	return;
	}

	l_element_courant = (*s_objet_argument_1).objet;
	l_element_courant = (*l_element_courant).suivant;

	if ((clef = formateur_flux(s_etat_processus, (unsigned char *)
	((l_element_courant).donnee).objet, &longueur_clef))
	== NULL)
	{
	free(fonction);
	free(chaine);

	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);
	return;
	}

	if (longueur_clef != longueur_clef_attendue)
	{
	free(fonction);
	free(chaine);
	free(clef);

	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);

	(*s_etat_processus).erreur_execution =
	d_ex_longueur_clef_chiffrement;
	return;
	}

	if ((vecteur_initialisation = malloc(longueur_clef *
	sizeof(unsigned char))) == NULL)
	{
	(*s_etat_processus).erreur_systeme =
	d_es_allocation_memoire;
	return;
	}

	memset(vecteur_initialisation, 0, longueur_clef);

	if ((tampon = chiffrement(EVP_chiffrement, d_vrai,
	chaine, longueur_chaine, clef, longueur_clef,
	vecteur_initialisation, longueur_clef,
	longueur_somme, &longueur_tampon)) == NULL)
	{
	free(fonction);
	free(vecteur_initialisation);
	free(chaine);
	free(clef);

	(*s_etat_processus).erreur_execution =
	d_ex_chiffrement;
	return;
	}

	free(vecteur_initialisation);
	free(chaine);
	free(clef);

	if ((s_objet_resultat = allocation(s_etat_processus, CHN))
	== NULL)
	{
	(*s_etat_processus).erreur_systeme =
	d_es_allocation_memoire;
	return;
	}

	if (((*s_objet_resultat).objet = analyse_flux(s_etat_processus,
	&(tampon[longueur_tampon - longueur_somme]),
	longueur_somme)) == NULL)
	{
	free(tampon);
	free(fonction);

	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);
	return;
	}

	free(tampon);

	# endif
	}
	else
	{
	free(fonction);

	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);

	(*s_etat_processus).erreur_execution =
	d_ex_chiffrement_indisponible;
	return;
	}

	free(fonction);
}	}
else	else
{	{
Line 1978 instruction_digest(struct_processus *s_e	Line 2155 instruction_digest(struct_processus *s_e
// Le second �l�ment de la cha�ne contient la clef utilis�e pour	// Le second �l�ment de la cha�ne contient la clef utilis�e pour
// la signature.	// la signature.

	free(fonction);

l_element_courant = (*s_objet_argument_1).objet;	l_element_courant = (*s_objet_argument_1).objet;
l_element_courant = (*l_element_courant).suivant;	l_element_courant = (*l_element_courant).suivant;

Line 2053 instruction_digest(struct_processus *s_e	Line 2232 instruction_digest(struct_processus *s_e
memcpy(tampon + longueur_bloc, chaine, longueur_chaine);	memcpy(tampon + longueur_bloc, chaine, longueur_chaine);
longueur_tampon = longueur_bloc + longueur_chaine;	longueur_tampon = longueur_bloc + longueur_chaine;

if (EVP_DigestInit(&contexte, EVP_sum()) != 1)	if (EVP_DigestInit(&contexte, EVP_sum) != 1)
{	{
free(tampon);	free(tampon);
free(clef);	free(clef);
Line 2115 instruction_digest(struct_processus *s_e	Line 2294 instruction_digest(struct_processus *s_e
memcpy(tampon + longueur_bloc, somme, longueur_somme);	memcpy(tampon + longueur_bloc, somme, longueur_somme);
longueur_tampon = longueur_bloc + longueur_somme;	longueur_tampon = longueur_bloc + longueur_somme;

if (EVP_DigestInit(&contexte, EVP_sum()) != 1)	if (EVP_DigestInit(&contexte, EVP_sum) != 1)
{	{
free(tampon);	free(tampon);
free(clef);	free(clef);

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.41
changed lines
	Added in v.1.42