Merge from trunk

This commit is contained in:
Robert Millan 2010-01-07 00:58:54 +00:00
commit c1d2f1d81b
20 changed files with 250 additions and 64 deletions

View file

@ -59,7 +59,10 @@ grub_cipher_unregister (gcry_cipher_spec_t *cipher)
gcry_cipher_spec_t **ciph;
for (ciph = &grub_ciphers; *ciph; ciph = &((*ciph)->next))
if (*ciph == cipher)
*ciph = (*ciph)->next;
{
*ciph = (*ciph)->next;
break;
}
}
void
@ -75,7 +78,10 @@ grub_md_unregister (gcry_md_spec_t *cipher)
gcry_md_spec_t **ciph;
for (ciph = &grub_digests; *ciph; ciph = &((*ciph)->next))
if (*ciph == cipher)
*ciph = (*ciph)->next;
{
*ciph = (*ciph)->next;
break;
}
}
void