diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2001-02-07 18:15:18 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2001-02-07 18:15:18 +0000 |
| commit | deb2c1a1c58fb738b3216b663212572170de8183 (patch) | |
| tree | f6aa0527d08b8fdcf4ce63eaf85aa3d6a73b1c34 /crypto/evp/evp.h | |
| parent | d4219c485b34818df8aa530f7d8d1c1daff44306 (diff) | |
| download | openssl-new-deb2c1a1c58fb738b3216b663212572170de8183.tar.gz | |
Fix AES code.
Update Rijndael source to v3.0
Add AES OIDs.
Change most references of Rijndael to AES.
Add new draft AES ciphersuites.
Diffstat (limited to 'crypto/evp/evp.h')
| -rw-r--r-- | crypto/evp/evp.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index e8b4de48df..f00d4cf1fb 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -109,7 +109,7 @@ #ifndef NO_MDC2 #include <openssl/mdc2.h> #endif -#ifndef NO_RIJNDAEL +#ifndef NO_AES #include <openssl/rijndael.h> #endif @@ -449,7 +449,7 @@ struct evp_cipher_ctx_st #ifndef NO_CAST CAST_KEY cast_ks;/* key schedule */ #endif -#ifndef NO_RIJNDAEL +#ifndef NO_AES RIJNDAEL_KEY rijndael; #endif } c; @@ -705,9 +705,13 @@ EVP_CIPHER *EVP_rc5_32_12_16_ecb(void); EVP_CIPHER *EVP_rc5_32_12_16_cfb(void); EVP_CIPHER *EVP_rc5_32_12_16_ofb(void); #endif -#ifndef NO_RIJNDAEL -EVP_CIPHER *EVP_rijndael_ecb(int nBlockLength,int nKeyLength); -EVP_CIPHER *EVP_rijndael_cbc(int nBlockLength,int nKeyLength); +#ifndef NO_AES +EVP_CIPHER *EVP_aes_128_ecb(void); +EVP_CIPHER *EVP_aes_128_cbc(void); +EVP_CIPHER *EVP_aes_192_ecb(void); +EVP_CIPHER *EVP_aes_192_cbc(void); +EVP_CIPHER *EVP_aes_256_ecb(void); +EVP_CIPHER *EVP_aes_256_cbc(void); #endif void OpenSSL_add_all_algorithms(void); |