Commit 080f3953 authored by Ben Laurie's avatar Ben Laurie Committed by Dr. Stephen Henson
Browse files

Fixups from previous commit.

parent f852b607

crypto/evp/c_allc.c

+0 −1
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ void OpenSSL_add_all_ciphers(void) 
	EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");

	EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");

#endif

#endif



#ifndef OPENSSL_NO_CAMELLIA

	EVP_add_cipher(EVP_camellia_128_ecb());

ssl/s3_cbc.c

+1 −2
Original line number Diff line number Diff line
@@ -139,8 +139,7 @@ int tls1_cbc_remove_padding(const SSL* s, 
			    unsigned mac_size)

	{

	unsigned padding_length, good, to_check, i;

	const char has_explicit_iv =

		s->version >= TLS1_1_VERSION || s->version == DTLS1_VERSION;

	const char has_explicit_iv = s->version == DTLS1_VERSION;

	const unsigned overhead = 1 /* padding length byte */ +

				  mac_size +

				  (has_explicit_iv ? block_size : 0);

ssl/ssl_algs.c

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ int SSL_library_init(void) 
	EVP_add_cipher(EVP_aes_256_cbc());

#endif



#endif

#ifndef OPENSSL_NO_CAMELLIA

	EVP_add_cipher(EVP_camellia_128_cbc());

	EVP_add_cipher(EVP_camellia_256_cbc());

ssl/t1_enc.c

+1 −0
Original line number Diff line number Diff line
@@ -641,6 +641,7 @@ int tls1_enc(SSL *s, int send) 
	EVP_CIPHER_CTX *ds;

	unsigned long l;

	int bs,i,j,k,pad=0,ret,mac_size=0;

	int n;

	const EVP_CIPHER *enc;



	if (send)