← Back to branch summary

~nvalcarcel/ubuntu/lucid/openssl/openssl-merge

« back to all changes in this revision

Viewing changes to crypto/rand/md_rand.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2009-08-11 21:19:18 UTC
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: james.westby@ubuntu.com-20090811211918-q52b1berxicp30hh
http://bugs.debian.org/539899
* Split all the patches into a separate files
* Stop undefinging HZ, the issue on alpha should be fixed.
* Remove MD2 from digest algorithm table.  (CVE-2009-2409) (Closes: #539899)

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/rand/md_rand.c
477
477
                MD_Update(&m,local_md,MD_DIGEST_LENGTH);
478
478
                MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c));
479
479
#ifndef PURIFY
480
 
#if 0 /* Don't add uninitialised data. */
481
480
                MD_Update(&m,buf,j); /* purify complains */
482
481
#endif
483
 
#endif
484
482
                k=(st_idx+MD_DIGEST_LENGTH/2)-st_num;
485
483
                if (k > 0)
486
484
                        {