~ubuntu-branches/ubuntu/lucid/openssl/lucid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/valgrind.patch

  • Committer: Bazaar Package Importer
  • Author(s): Nicolas Valcárcel Scerpella (Canonical)
  • Date: 2009-12-06 20:16:24 UTC
  • mfrom: (11.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20091206201624-u126qjpqm2n2uuhu
Tags: 0.9.8k-7ubuntu1
* Merge from debian unstable, remaining changes (LP: #493392):
  - Link using -Bsymbolic-functions
  - Add support for lpia
  - Disable SSLv2 during compile
  - Ship documentation in openssl-doc, suggested by the package.
  - Use a different priority for libssl0.9.8/restart-services
    depending on whether a desktop, or server dist-upgrade is being
    performed.
  - Display a system restart required notification bubble on libssl0.9.8
    upgrade.
  - Replace duplicate files in the doc directory with symlinks.
  - Move runtime libraries to /lib, for the benefit of wpasupplicant
* Strip the patches out of the source into quilt patches
* Disable CVE-2009-3555.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Index: openssl-0.9.8k/crypto/rand/md_rand.c
 
2
===================================================================
 
3
--- openssl-0.9.8k.orig/crypto/rand/md_rand.c   2008-09-16 13:50:05.000000000 +0200
 
4
+++ openssl-0.9.8k/crypto/rand/md_rand.c        2009-07-19 11:36:05.000000000 +0200
 
5
@@ -477,8 +477,10 @@
 
6
                MD_Update(&m,local_md,MD_DIGEST_LENGTH);
 
7
                MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c));
 
8
 #ifndef PURIFY
 
9
+#if 0 /* Don't add uninitialised data. */
 
10
                MD_Update(&m,buf,j); /* purify complains */
 
11
 #endif
 
12
+#endif
 
13
                k=(st_idx+MD_DIGEST_LENGTH/2)-st_num;
 
14
                if (k > 0)
 
15
                        {