← Back to branch summary

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

« back to all changes in this revision

Viewing changes to crypto/evp/e_aes.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:
crypto/evp/e_aes.c
69
69
 
70
70
IMPLEMENT_BLOCK_CIPHER(aes_128, ks, AES, EVP_AES_KEY,
71
71
                       NID_aes_128, 16, 16, 16, 128,
72
 
                       0, aes_init_key, NULL, 
73
 
                       EVP_CIPHER_set_asn1_iv,
74
 
                       EVP_CIPHER_get_asn1_iv,
75
 
                       NULL)
 
72
                       EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1,
 
73
                       aes_init_key,
 
74
                       NULL, NULL, NULL, NULL)
76
75
IMPLEMENT_BLOCK_CIPHER(aes_192, ks, AES, EVP_AES_KEY,
77
76
                       NID_aes_192, 16, 24, 16, 128,
78
 
                       0, aes_init_key, NULL, 
79
 
                       EVP_CIPHER_set_asn1_iv,
80
 
                       EVP_CIPHER_get_asn1_iv,
81
 
                       NULL)
 
77
                       EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1,
 
78
                       aes_init_key,
 
79
                       NULL, NULL, NULL, NULL)
82
80
IMPLEMENT_BLOCK_CIPHER(aes_256, ks, AES, EVP_AES_KEY,
83
81
                       NID_aes_256, 16, 32, 16, 128,
84
 
                       0, aes_init_key, NULL, 
85
 
                       EVP_CIPHER_set_asn1_iv,
86
 
                       EVP_CIPHER_get_asn1_iv,
87
 
                       NULL)
88
 
 
89
 
#define IMPLEMENT_AES_CFBR(ksize,cbits) IMPLEMENT_CFBR(aes,AES,EVP_AES_KEY,ks,ksize,cbits,16)
90
 
 
91
 
IMPLEMENT_AES_CFBR(128,1)
92
 
IMPLEMENT_AES_CFBR(192,1)
93
 
IMPLEMENT_AES_CFBR(256,1)
94
 
 
95
 
IMPLEMENT_AES_CFBR(128,8)
96
 
IMPLEMENT_AES_CFBR(192,8)
97
 
IMPLEMENT_AES_CFBR(256,8)
 
82
                       EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1,
 
83
                       aes_init_key,
 
84
                       NULL, NULL, NULL, NULL)
 
85
 
 
86
#define IMPLEMENT_AES_CFBR(ksize,cbits,flags)   IMPLEMENT_CFBR(aes,AES,EVP_AES_KEY,ks,ksize,cbits,16,flags)
 
87
 
 
88
IMPLEMENT_AES_CFBR(128,1,EVP_CIPH_FLAG_FIPS)
 
89
IMPLEMENT_AES_CFBR(192,1,EVP_CIPH_FLAG_FIPS)
 
90
IMPLEMENT_AES_CFBR(256,1,EVP_CIPH_FLAG_FIPS)
 
91
 
 
92
IMPLEMENT_AES_CFBR(128,8,EVP_CIPH_FLAG_FIPS)
 
93
IMPLEMENT_AES_CFBR(192,8,EVP_CIPH_FLAG_FIPS)
 
94
IMPLEMENT_AES_CFBR(256,8,EVP_CIPH_FLAG_FIPS)
98
95
 
99
96
static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
100
97
                   const unsigned char *iv, int enc)