Commit 4d4744ef 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 0242564c

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


 Changes between 0.9.6c and 0.9.6d  [XX xxx XXXX]



  *) Fix EVP_CIPHER_mode macro.

     ["Dan S. Camper" <dan@bti.net>]



  *) Fix ssl3_read_bytes (ssl/s3_pkt.c): To ignore messages of unknown

     type, we must throw them away by setting rr->length to 0.

     [D P Chang <dpc@qualys.com>]

crypto/evp/evp.h

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