From: Bodo Möller Date: Fri, 4 Jan 2002 13:04:45 +0000 (+0000) Subject: fix EVP_CIPHER_mode macro X-Git-Tag: OpenSSL-engine-0_9_6c^2^2~121 X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=e5d6528a1223a7f94fe399881451589d6a5ad0bb;ds=sidebyside fix EVP_CIPHER_mode macro Submitted by: "Dan S. Camper" --- diff --git a/CHANGES b/CHANGES index cbc79829c5..48ac44e80a 100644 --- a/CHANGES +++ b/CHANGES @@ -12,6 +12,9 @@ *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7 +) applies to 0.9.7 only + *) Fix EVP_CIPHER_mode macro. + ["Dan S. Camper" ] + +) Change the AES code to follow the same name structure as all other symmetric ciphers, and behave the same way. Move everything to the directory crypto/aes, thereby obsoleting crypto/rijndael. diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 8d86d85f8d..beb2c9eb44 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -409,7 +409,7 @@ typedef int (EVP_PBE_KEYGEN)(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, #define EVP_CIPHER_key_length(e) ((e)->key_len) #define EVP_CIPHER_iv_length(e) ((e)->iv_len) #define EVP_CIPHER_flags(e) ((e)->flags) -#define EVP_CIPHER_mode(e) ((e)->flags) & EVP_CIPH_MODE) +#define EVP_CIPHER_mode(e) (((e)->flags) & EVP_CIPH_MODE) #define EVP_CIPHER_CTX_cipher(e) ((e)->cipher) #define EVP_CIPHER_CTX_nid(e) ((e)->cipher->nid)