← Back to branch summary

~ubuntu-branches/ubuntu/lucid/openssh/lucid

« back to all changes in this revision

Viewing changes to cipher-ctr.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2008-09-30 23:09:58 UTC
  • mfrom: (1.13.3 upstream) (29 hardy)
  • mto: This revision was merged to the branch mainline in revision 43.
  • Revision ID: james.westby@ubuntu.com-20080930230958-o6vsgn8c4mm959s0
Tags: 1:5.1p1-3
http://bugs.debian.org/496495
http://bugs.debian.org/498681
* Remove unnecessary ssh-vulnkey output in non-verbose mode when no
  compromised or unknown keys were found (closes: #496495).
* Configure with --disable-strip; dh_strip will deal with stripping
  binaries and will honour DEB_BUILD_OPTIONS (thanks, Bernhard R. Link;
  closes: #498681).
* Fix handling of zero-length server banners (thanks, Tomas Mraz; closes:
  #497026).

Show diffs side-by-side

added added

removed removed

Lines of Context:
cipher-ctr.c
29
29
/* compatibility with old or broken OpenSSL versions */
30
30
#include "openbsd-compat/openssl-compat.h"
31
31
 
32
 
#ifdef USE_BUILTIN_RIJNDAEL
33
 
#include "rijndael.h"
34
 
#define AES_KEY rijndael_ctx
35
 
#define AES_BLOCK_SIZE 16
36
 
#define AES_encrypt(a, b, c) rijndael_encrypt(c, a, b)
37
 
#define AES_set_encrypt_key(a, b, c) rijndael_set_key(c, (char *)a, b, 1)
38
 
#else
 
32
#ifndef USE_BUILTIN_RIJNDAEL
39
33
#include <openssl/aes.h>
40
34
#endif
41
35