Commit e5d6528a authored by Bodo Möller's avatar Bodo Möller
Browse files

fix EVP_CIPHER_mode macro 

Submitted by: "Dan S. Camper" <dan@bti.net>
parent 980afccf

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -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" <dan@bti.net>]



  +) 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.

crypto/evp/evp.h

+1 −1
Original line number Diff line number Diff line
@@ -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)