← Back to branch summary

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

« back to all changes in this revision

Viewing changes to crypto/des/set_key.c

  • 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
https://launchpad.net/bugs/493392
* 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:
crypto/des/set_key.c
64
64
 * 1.0 First working version
65
65
 */
66
66
#include "des_locl.h"
 
67
#ifdef OPENSSL_FIPS
 
68
#include <openssl/fips.h>
 
69
#endif
 
70
 
67
71
 
68
72
OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key);    /* defaults to false */
69
73
 
349
353
        k = &schedule->ks->deslong[0];
350
354
        in = &(*key)[0];
351
355
 
 
356
#ifdef OPENSSL_FIPS
 
357
        FIPS_selftest_check();
 
358
#endif
 
359
 
352
360
        c2l(in,c);
353
361
        c2l(in,d);
354
362
 
405
413
        des_set_odd_parity(key);
406
414
        }
407
415
*/
 
416