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

« back to all changes in this revision

Viewing changes to crypto/des/des_enc.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2009-06-13 18:15:46 UTC
  • mto: (11.1.5 squeeze)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: james.westby@ubuntu.com-20090613181546-vbfntai3b009dl1u
Tags: upstream-0.9.8k
ImportĀ upstreamĀ versionĀ 0.9.8k

Show diffs side-by-side

added added

removed removed

Lines of Context:
289
289
 
290
290
#ifndef DES_DEFAULT_OPTIONS
291
291
 
 
292
#if !defined(OPENSSL_FIPS_DES_ASM)
 
293
 
292
294
#undef CBC_ENC_C__DONT_UPDATE_IV
293
295
#include "ncbc_enc.c" /* DES_ncbc_encrypt */
294
296
 
404
406
        tin[0]=tin[1]=0;
405
407
        }
406
408
 
 
409
#endif
 
410
 
407
411
#endif /* DES_DEFAULT_OPTIONS */