← Back to branch summary

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

« back to all changes in this revision

Viewing changes to crypto/aes/aes.h

  • 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/aes/aes.h
66
66
#define AES_MAXNR 14
67
67
#define AES_BLOCK_SIZE 16
68
68
 
 
69
#ifdef OPENSSL_FIPS
 
70
#define FIPS_AES_SIZE_T int
 
71
#endif
 
72
 
69
73
#ifdef  __cplusplus
70
74
extern "C" {
71
75
#endif
130
134
                        const AES_KEY *key2, const unsigned char *ivec,
131
135
                        const int enc);
132
136
 
 
137
int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
 
138
                unsigned char *out,
 
139
                const unsigned char *in, unsigned int inlen);
 
140
int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
 
141
                unsigned char *out,
 
142
                const unsigned char *in, unsigned int inlen);
133
143
 
134
144
#ifdef  __cplusplus
135
145
}